Mercurial > emacs
annotate src/regex.c @ 91121:1805a65e7746
(read1): Undo the previous change.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Wed, 21 Nov 2007 12:12:06 +0000 |
parents | bdb3fe0ba9fa |
children | b7a5a89054dc |
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 | |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
5 Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
78335
655b84302874
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75348
diff
changeset
|
6 2002, 2003, 2004, 2005, 2006, 2007 |
655b84302874
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75348
diff
changeset
|
7 Free Software Foundation, Inc. |
1155 | 8 |
11864
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 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
|
10 it under the terms of the GNU General Public License as published by |
78335
655b84302874
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75348
diff
changeset
|
11 the Free Software Foundation; either version 3, or (at your option) |
11864
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 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
|
13 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
14 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
|
15 but WITHOUT ANY WARRANTY; without even the implied warranty of |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
16 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
|
17 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
|
18 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
19 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
|
20 along with this program; if not, write to the Free Software |
64084 | 21 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
22 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
|
23 |
47368
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
24 /* TODO: |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
25 - structure the opcode space into opcode+flag. |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
26 - merge with glibc's regex.[ch]. |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
27 - 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
|
28 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
|
29 - 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
|
30 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
|
31 */ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
32 |
11864
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 /* 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
|
34 #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
|
35 #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
|
36 #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
|
37 |
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 #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
|
39 # 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
|
40 #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
|
41 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
42 #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
|
43 # include <stddef.h> |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
44 #else |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
45 /* 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
|
46 # include <sys/types.h> |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
47 #endif |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
48 |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
49 /* 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
|
50 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
|
51 #if defined _LIBC |
287021d71c8a
(WIDE_CHAR_SUPPORT): Do not use defined() in macro.
Gerd Moellmann <gerd@gnu.org>
parents:
37705
diff
changeset
|
52 #define WIDE_CHAR_SUPPORT 1 |
287021d71c8a
(WIDE_CHAR_SUPPORT): Do not use defined() in macro.
Gerd Moellmann <gerd@gnu.org>
parents:
37705
diff
changeset
|
53 #else |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
54 #define WIDE_CHAR_SUPPORT \ |
39718
287021d71c8a
(WIDE_CHAR_SUPPORT): Do not use defined() in macro.
Gerd Moellmann <gerd@gnu.org>
parents:
37705
diff
changeset
|
55 (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
|
56 #endif |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
57 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
58 /* 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
|
59 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
|
60 #if WIDE_CHAR_SUPPORT |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
61 /* 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
|
62 # include <wchar.h> |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
63 # include <wctype.h> |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
64 #endif |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
65 |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
66 #ifdef _LIBC |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
67 /* 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
|
68 # 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
|
69 # 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
|
70 # define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags) |
74955
0b7286cbaf0c
(regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents:
74323
diff
changeset
|
71 # define regerror(err_code, preg, errbuf, errbuf_size) \ |
0b7286cbaf0c
(regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents:
74323
diff
changeset
|
72 __regerror(err_code, preg, errbuf, errbuf_size) |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
73 # 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
|
74 __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 # 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
|
76 __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 # 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
|
78 __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 # 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
|
80 __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 # 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
|
82 __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 # 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
|
84 # 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
|
85 __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 # 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
|
87 |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
88 /* 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
|
89 # define btowc __btowc |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
90 # define iswctype __iswctype |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
91 # define wctype __wctype |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
92 |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
93 # 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
|
94 |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
95 /* 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
|
96 # include <locale/localeinfo.h> |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
97 # 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
|
98 # include <langinfo.h> |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
99 #else |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
100 # 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
|
101 #endif |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
102 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
103 /* 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
|
104 #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
|
105 # 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
|
106 #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
|
107 # 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
|
108 #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
|
109 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
110 #ifndef gettext_noop |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
111 /* 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
|
112 strings. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
113 # define gettext_noop(String) String |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
114 #endif |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
115 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
116 /* 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
|
117 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
|
118 #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
|
119 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
120 # include "lisp.h" |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
121 # include "buffer.h" |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
122 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
123 /* 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
|
124 # 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
|
125 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
126 # include "syntax.h" |
88387
06da178fab0e
* regex.c: Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
40650
diff
changeset
|
127 # include "character.h" |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
128 # include "category.h" |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
129 |
37705
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
130 # ifdef malloc |
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
131 # undef malloc |
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
132 # endif |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
133 # define malloc xmalloc |
37705
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
134 # ifdef realloc |
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
135 # undef realloc |
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
136 # endif |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
137 # define realloc xrealloc |
37705
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
138 # ifdef free |
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
139 # undef free |
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
140 # endif |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
141 # define free xfree |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
142 |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
143 /* Converts the pointer to the char to BEG-based offset from the start. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
144 # 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
|
145 # 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
|
146 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
147 # define RE_MULTIBYTE_P(bufp) ((bufp)->multibyte) |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
148 # define RE_TARGET_MULTIBYTE_P(bufp) ((bufp)->target_multibyte) |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
149 # define RE_STRING_CHAR(p, s, multibyte) \ |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
150 (multibyte ? (STRING_CHAR (p, s)) : (*(p))) |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
151 # define RE_STRING_CHAR_AND_LENGTH(p, s, len, multibyte) \ |
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 |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
154 # define RE_CHAR_TO_MULTIBYTE(c) unibyte_to_multibyte_table[(c)] |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
155 |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
156 # define RE_CHAR_TO_UNIBYTE(c) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
157 (ASCII_CHAR_P (c) ? (c) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
158 : CHAR_BYTE8_P (c) ? CHAR_TO_BYTE8 (c) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
159 : multibyte_char_to_unibyte_safe (c)) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
160 |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
161 /* Set C a (possibly converted to multibyte) character before P. P |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
162 points into a string which is the virtual concatenation of STR1 |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
163 (which ends at END1) or STR2 (which ends at END2). */ |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
164 # define GET_CHAR_BEFORE_2(c, p, str1, end1, str2, end2) \ |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
165 do { \ |
90764
324e371fbbe5
(GET_CHAR_BEFORE_2, GET_CHAR_AFTER): Check the variable
Kenichi Handa <handa@m17n.org>
parents:
90757
diff
changeset
|
166 if (target_multibyte) \ |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
167 { \ |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
168 re_char *dtemp = (p) == (str2) ? (end1) : (p); \ |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
169 re_char *dlimit = ((p) > (str2) && (p) <= (end2)) ? (str2) : (str1); \ |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
170 while (dtemp-- > dlimit && !CHAR_HEAD_P (*dtemp)); \ |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
171 c = STRING_CHAR (dtemp, (p) - dtemp); \ |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
172 } \ |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
173 else \ |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
174 { \ |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
175 (c = ((p) == (str2) ? (end1) : (p))[-1]); \ |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
176 (c) = RE_CHAR_TO_MULTIBYTE (c); \ |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
177 } \ |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
178 } while (0) |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
179 |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
180 /* Set C a (possibly converted to multibyte) character at P, and set |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
181 LEN to the byte length of that character. */ |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
182 # define GET_CHAR_AFTER(c, p, len) \ |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
183 do { \ |
90764
324e371fbbe5
(GET_CHAR_BEFORE_2, GET_CHAR_AFTER): Check the variable
Kenichi Handa <handa@m17n.org>
parents:
90757
diff
changeset
|
184 if (target_multibyte) \ |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
185 (c) = STRING_CHAR_AND_LENGTH (p, 0, len); \ |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
186 else \ |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
187 { \ |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
188 (c) = *p; \ |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
189 len = 1; \ |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
190 (c) = RE_CHAR_TO_MULTIBYTE (c); \ |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
191 } \ |
89483 | 192 } while (0) |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
193 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
194 #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
|
195 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
196 /* 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
|
197 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
|
198 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
|
199 # undef REL_ALLOC |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
200 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
201 # 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
|
202 # include <stdlib.h> |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
203 # 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
|
204 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
|
205 char *realloc (); |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
206 # 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
|
207 |
69038
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
208 /* When used in Emacs's lib-src, we need xmalloc and xrealloc. */ |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
209 |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
210 void * |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
211 xmalloc (size) |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
212 size_t size; |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
213 { |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
214 register void *val; |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
215 val = (void *) malloc (size); |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
216 if (!val && size) |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
217 { |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
218 write (2, "virtual memory exhausted\n", 25); |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
219 exit (1); |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
220 } |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
221 return val; |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
222 } |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
223 |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
224 void * |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
225 xrealloc (block, size) |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
226 void *block; |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
227 size_t size; |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
228 { |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
229 register void *val; |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
230 /* We must call malloc explicitly when BLOCK is 0, since some |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
231 reallocs don't do this. */ |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
232 if (! block) |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
233 val = (void *) malloc (size); |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
234 else |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
235 val = (void *) realloc (block, size); |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
236 if (!val && size) |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
237 { |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
238 write (2, "virtual memory exhausted\n", 25); |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
239 exit (1); |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
240 } |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
241 return val; |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
242 } |
b2288bb7d88f
* regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents:
69032
diff
changeset
|
243 |
69039
f717c65a39d7
* regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
69038
diff
changeset
|
244 # ifdef malloc |
f717c65a39d7
* regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
69038
diff
changeset
|
245 # undef malloc |
f717c65a39d7
* regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
69038
diff
changeset
|
246 # endif |
f717c65a39d7
* regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
69038
diff
changeset
|
247 # define malloc xmalloc |
f717c65a39d7
* regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
69038
diff
changeset
|
248 # ifdef realloc |
f717c65a39d7
* regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
69038
diff
changeset
|
249 # undef realloc |
f717c65a39d7
* regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
69038
diff
changeset
|
250 # endif |
f717c65a39d7
* regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
69038
diff
changeset
|
251 # define realloc xrealloc |
f717c65a39d7
* regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
69038
diff
changeset
|
252 |
12065
094636c759bf
Undefined INHIBIT_STRING_HEADER when we have no
Karl Heuer <kwzh@gnu.org>
parents:
11974
diff
changeset
|
253 /* 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
|
254 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
|
255 # 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
|
256 # 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
|
257 # 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
|
258 # 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
|
259 # endif |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
260 # endif |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
261 # endif |
12065
094636c759bf
Undefined INHIBIT_STRING_HEADER when we have no
Karl Heuer <kwzh@gnu.org>
parents:
11974
diff
changeset
|
262 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
263 /* 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
|
264 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
|
265 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
|
266 # 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
|
267 # 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
|
268 # include <string.h> |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
269 # ifndef bzero |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
270 # ifndef _LIBC |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
271 # 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
|
272 # else |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
273 # 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
|
274 # endif |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
275 # endif |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
276 # else |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
277 # include <strings.h> |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
278 # ifndef memcmp |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
279 # 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
|
280 # endif |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
281 # ifndef memcpy |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
282 # 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
|
283 # endif |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
284 # endif |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
285 # 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
|
286 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
287 /* 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
|
288 |
28279
24a23e27dac6
(enum syntaxcode): Provide default for non-Emacs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28268
diff
changeset
|
289 /* Sword must be nonzero for the wordchar pattern commands in re_match_2. */ |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
290 enum syntaxcode { Swhitespace = 0, Sword = 1, Ssymbol = 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
|
291 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
292 # 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
|
293 # 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
|
294 # else |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
295 # 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
|
296 # endif |
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 /* 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
|
299 # 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
|
300 # 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
|
301 # 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
|
302 # 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
|
303 # define RE_MULTIBYTE_P(x) 0 |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
304 # define RE_TARGET_MULTIBYTE_P(x) 0 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
305 # 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
|
306 # 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
|
307 # 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
|
308 # 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
|
309 # define MULTIBYTE_FORM_LENGTH(p, s) (1) |
49276
f71131f142ff
(GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents:
48424
diff
changeset
|
310 # define PREV_CHAR_BOUNDARY(p, limit) ((p)--) |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
311 # define STRING_CHAR(p, s) (*(p)) |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
312 # define RE_STRING_CHAR(p, s, multibyte) STRING_CHAR ((p), (s)) |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
313 # 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
|
314 # define STRING_CHAR_AND_LENGTH(p, s, actual_len) ((actual_len) = 1, *(p)) |
90766
128e9642f988
(RE_STRING_CHAR_AND_LENGTH) [! emacs]: Add missing arg `len'.
Juanma Barranquero <lekktu@gmail.com>
parents:
90764
diff
changeset
|
315 # define RE_STRING_CHAR_AND_LENGTH(p, s, len, multibyte) STRING_CHAR_AND_LENGTH ((p), (s), (len)) |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
316 # define RE_CHAR_TO_MULTIBYTE(c) (c) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
317 # define RE_CHAR_TO_UNIBYTE(c) (c) |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
318 # 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
|
319 (c = ((p) == (str2) ? *((end1) - 1) : *((p) - 1))) |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
320 # define GET_CHAR_AFTER(c, p, len) \ |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
321 (c = *p, len = 1) |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
322 # define MAKE_CHAR(charset, c1, c2) (c1) |
88387
06da178fab0e
* regex.c: Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
40650
diff
changeset
|
323 # define BYTE8_TO_CHAR(c) (c) |
06da178fab0e
* regex.c: Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
40650
diff
changeset
|
324 # define CHAR_BYTE8_P(c) (0) |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
325 # define CHAR_LEADING_CODE(c) (c) |
89483 | 326 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
327 #endif /* not emacs */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
328 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
329 #ifndef RE_TRANSLATE |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
330 # 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
|
331 # 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
|
332 #endif |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
333 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
334 /* 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
|
335 #include "regex.h" |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
336 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
337 /* 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
|
338 #include <ctype.h> |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
339 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
340 #ifdef emacs |
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 /* 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
|
343 # 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
|
344 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
345 /* 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
|
346 # 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
|
347 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
348 /* 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
|
349 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
350 /* 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
|
351 # 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
|
352 # 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
|
353 # 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
|
354 || ((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
|
355 || ((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
|
356 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
357 /* 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
|
358 # 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
|
359 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
360 /* 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
|
361 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
362 # 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
|
363 ? (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
|
364 : 1) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
365 |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
366 # 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
|
367 ? (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
|
368 : 1) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
369 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
370 # 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
|
371 ? (((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
|
372 || ((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
|
373 || ((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
|
374 : SYNTAX (c) == Sword) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
375 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
376 # 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
|
377 ? (((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
|
378 || ((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
|
379 : SYNTAX (c) == Sword) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
380 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
381 # 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
|
382 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
383 # 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
|
384 ? ((c) > ' ' && (c) < 0177 \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
385 && !(((c) >= 'a' && (c) <= 'z') \ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
386 || ((c) >= 'A' && (c) <= 'Z') \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
387 || ((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
|
388 : SYNTAX (c) != Sword) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
389 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
390 # 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
|
391 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
392 # 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
|
393 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
394 # 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
|
395 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
396 #else /* not emacs */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
397 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
398 /* Jim Meyering writes: |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
399 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
400 "... 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
|
401 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
|
402 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
|
403 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
|
404 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
|
405 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
|
406 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
|
407 eliminate the && through constant folding." |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
408 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
|
409 |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
410 # undef ISASCII |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
411 # 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
|
412 # 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
|
413 # else |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
414 # 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
|
415 # endif |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
416 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
417 /* 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
|
418 # 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
|
419 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
420 /* 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
|
421 # 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
|
422 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
423 # ifdef isblank |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
424 # 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
|
425 # else |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
426 # 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
|
427 # endif |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
428 # ifdef isgraph |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
429 # 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
|
430 # else |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
431 # 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
|
432 # endif |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
433 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
434 # undef ISPRINT |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
435 # 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
|
436 # 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
|
437 # 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
|
438 # 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
|
439 # 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
|
440 # 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
|
441 # 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
|
442 # 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
|
443 # 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
|
444 # 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
|
445 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
446 # 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
|
447 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
448 # ifdef _tolower |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
449 # define TOLOWER(c) _tolower(c) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
450 # else |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
451 # define TOLOWER(c) tolower(c) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
452 # endif |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
453 |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
454 /* 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
|
455 # define CHAR_SET_SIZE 256 |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
456 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
457 # 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
|
458 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
459 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
|
460 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
461 # 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
|
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 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
|
464 |
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 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
|
466 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
|
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 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
|
469 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
|
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 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
|
472 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
|
473 |
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 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
|
475 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
476 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
|
477 if (ISALNUM (c)) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
478 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
|
479 |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
480 re_syntax_table['_'] = Ssymbol; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
481 |
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 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
|
483 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
484 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
485 # endif /* not SYNTAX_TABLE */ |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
486 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
487 # 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
|
488 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
489 #endif /* not emacs */ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
490 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
491 #ifndef NULL |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
492 # 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
|
493 #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
|
494 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
495 /* 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
|
496 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
|
497 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
|
498 (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
|
499 #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
|
500 #if __STDC__ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
501 # 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
|
502 #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
|
503 /* 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
|
504 # 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
|
505 #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
|
506 |
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 /* 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
|
508 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
|
509 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
|
510 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
|
511 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
|
512 |
11864
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 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
|
514 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
|
515 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
|
516 |
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 #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
|
518 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
519 # 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
|
520 # 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
|
521 # 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
|
522 |
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 #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
|
524 |
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 /* 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
|
526 # 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
|
527 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
528 /* 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
|
529 # ifdef __GNUC__ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
530 # 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
|
531 # else /* not __GNUC__ */ |
89071
c49c3ca273ba
Use `ifdef HAVE_ALLOCA_H', not `if HAVE_ALLOCA_H'.
Dave Love <fx@gnu.org>
parents:
89061
diff
changeset
|
532 # ifdef HAVE_ALLOCA_H |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
533 # include <alloca.h> |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
534 # 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
|
535 # endif /* not __GNUC__ */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
536 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
537 # endif /* not alloca */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
538 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
539 # 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
|
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 /* 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
|
542 # 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
|
543 (destination = (char *) alloca (nsize), \ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
544 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
|
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 /* 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
|
547 # 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
|
548 |
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 #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
|
550 |
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 /* 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
|
552 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
553 #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
|
554 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
555 # 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
|
556 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
|
557 # 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
|
558 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
|
559 # 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
|
560 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
|
561 |
12478
533b6d02cf04
Don't use relocatable allocator.
Richard M. Stallman <rms@gnu.org>
parents:
12331
diff
changeset
|
562 #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
|
563 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
564 # ifdef REGEX_MALLOC |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
565 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
566 # 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
|
567 # 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
|
568 # 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
|
569 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
570 # 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
|
571 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
572 # 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
|
573 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
574 # 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
|
575 REGEX_REALLOCATE (source, osize, nsize) |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
576 /* 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
|
577 # 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
|
578 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
579 # endif /* not REGEX_MALLOC */ |
12478
533b6d02cf04
Don't use relocatable allocator.
Richard M. Stallman <rms@gnu.org>
parents:
12331
diff
changeset
|
580 #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
|
581 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
582 |
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 /* 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
|
584 `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
|
585 a good thing. */ |
18262 | 586 #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
|
587 (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
|
588 |
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 /* (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
|
590 #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
|
591 #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
|
592 #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
|
593 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
|
594 #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
|
595 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
596 #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
|
597 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
598 #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
|
599 |
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 #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
|
601 #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
|
602 #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
|
603 #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
|
604 |
65817
251409bdae6a
(re_char): Move it back to the implementation file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65764
diff
changeset
|
605 /* Type of source-pattern and string chars. */ |
251409bdae6a
(re_char): Move it back to the implementation file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65764
diff
changeset
|
606 typedef const unsigned char re_char; |
251409bdae6a
(re_char): Move it back to the implementation file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65764
diff
changeset
|
607 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
608 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
|
609 #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
|
610 #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
|
611 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
612 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
|
613 re_char *string1, int size1, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
614 re_char *string2, int size2, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
615 int pos, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
616 struct re_registers *regs, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
617 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
|
618 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
619 /* 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
|
620 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
|
621 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
|
622 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
|
623 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
624 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
|
625 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
626 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
|
627 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
628 /* 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
|
629 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
|
630 |
18262 | 631 /* 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
|
632 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
|
633 |
18262 | 634 /* 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
|
635 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
|
636 |
18262 | 637 /* Matches any one char belonging to specified set. First |
638 following byte is number of bitmap bytes. Then come bytes | |
639 for a bitmap saying which chars are in. Bits in each byte | |
640 are ordered low-bit-first. A character is in the set if its | |
641 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
|
642 automatically not in the set. |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
643 |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
644 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
|
645 is followed by a range table: |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
646 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
|
647 See RANGE_TABLE_WORK_BITS below. |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
648 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
|
649 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
|
650 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
|
651 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
|
652 |
18262 | 653 /* 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
|
654 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
|
655 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
|
656 |
18262 | 657 /* Start remembering the text that is matched, for storing in a |
658 register. Followed by one byte with the register number, in | |
659 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
|
660 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
|
661 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
|
662 |
18262 | 663 /* Stop remembering the text that is matched and store it in a |
664 memory register. Followed by one byte with the register | |
665 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
|
666 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
|
667 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
|
668 |
18262 | 669 /* 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
|
670 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
|
671 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
|
672 |
18262 | 673 /* 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
|
674 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
|
675 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
676 /* 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
|
677 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
|
678 |
18262 | 679 /* Succeeds if at beginning of buffer (if emacs) or at beginning |
680 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
|
681 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
|
682 |
18262 | 683 /* 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
|
684 endbuf, |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
685 |
18262 | 686 /* 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
|
687 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
|
688 |
18262 | 689 /* Followed by two-byte relative address of place to resume at |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
690 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
|
691 on_failure_jump, |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
692 |
18262 | 693 /* Like on_failure_jump, but pushes a placeholder instead of the |
694 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
|
695 on_failure_keep_string_jump, |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
696 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
697 /* 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
|
698 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
|
699 indefinitely). */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
700 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
|
701 |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
702 /* 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
|
703 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
|
704 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
|
705 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
|
706 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
|
707 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
708 /* 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
|
709 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
|
710 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
|
711 `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
|
712 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
|
713 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
|
714 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
|
715 |
18262 | 716 /* 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
|
717 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
|
718 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
|
719 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
|
720 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
|
721 |
18262 | 722 /* Followed by two-byte relative address, and two-byte number n. |
723 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
|
724 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
|
725 |
18262 | 726 /* Set the following two-byte relative address to the |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
727 subsequent two-byte number. The address *includes* the two |
18262 | 728 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
|
729 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
|
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 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
|
732 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
|
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 wordbound, /* Succeeds if at a word boundary. */ |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
735 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
|
736 |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
737 symbeg, /* Succeeds if at symbol beginning. */ |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
738 symend, /* Succeeds if at symbol end. */ |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
739 |
11864
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 /* Matches any character whose syntax is specified. Followed by |
18262 | 741 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
|
742 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
|
743 |
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 /* 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
|
745 notsyntaxspec |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
746 |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
747 #ifdef emacs |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
748 ,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
|
749 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
|
750 after_dot, /* Succeeds if after point. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
751 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
752 /* Matches any character whose category-set contains the specified |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
753 category. The operator is followed by a byte which contains a |
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
754 category code (mnemonic ASCII character). */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
755 categoryspec, |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
756 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
757 /* 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
|
758 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
|
759 contains the category code (mnemonic ASCII character). */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
760 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
|
761 #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
|
762 } 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
|
763 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
764 /* 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
|
765 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
766 /* 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
|
767 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
768 #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
|
769 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
|
770 (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
|
771 (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
|
772 } 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
|
773 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
774 /* 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
|
775 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
|
776 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
|
777 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
778 #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
|
779 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
|
780 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
|
781 (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
|
782 } 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
|
783 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
784 /* 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
|
785 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
|
786 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
787 #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
|
788 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
|
789 (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
|
790 (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
|
791 } 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
|
792 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
793 #ifdef DEBUG |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
794 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
|
795 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
|
796 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
|
797 int *dest; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
798 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
|
799 { |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
800 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
|
801 *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
|
802 *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
|
803 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
804 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
805 # 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
|
806 # undef EXTRACT_NUMBER |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
807 # 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
|
808 # 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
|
809 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
810 #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
|
811 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
812 /* 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
|
813 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
|
814 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
815 #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
|
816 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
|
817 EXTRACT_NUMBER (destination, source); \ |
18262 | 818 (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
|
819 } 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
|
820 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
821 #ifdef DEBUG |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
822 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
|
823 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
|
824 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
|
825 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
|
826 int *destination; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
827 re_char **source; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
828 { |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
829 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
|
830 *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
|
831 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
832 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
833 # ifndef EXTRACT_MACROS |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
834 # 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
|
835 # 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
|
836 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
|
837 # 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
|
838 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
839 #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
|
840 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
841 /* 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
|
842 DESTINATION, and increment DESTINATION to the byte after where the |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
843 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
|
844 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
845 #define STORE_CHARACTER_AND_INCR(destination, character) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
846 do { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
847 (destination)[0] = (character) & 0377; \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
848 (destination)[1] = ((character) >> 8) & 0377; \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
849 (destination)[2] = (character) >> 16; \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
850 (destination) += 3; \ |
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 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
853 /* Put into DESTINATION a character stored in three contiguous bytes |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
854 starting at SOURCE. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
855 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
856 #define EXTRACT_CHARACTER(destination, source) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
857 do { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
858 (destination) = ((source)[0] \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
859 | ((source)[1] << 8) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
860 | ((source)[2] << 16)); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
861 } while (0) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
862 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
863 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
864 /* Macros for charset. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
865 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
866 /* 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
|
867 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
|
868 #define CHARSET_BITMAP_SIZE(p) ((p)[1] & 0x7F) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
869 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
870 /* Nonzero if charset P has range table. */ |
18262 | 871 #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
|
872 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
873 /* 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
|
874 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
|
875 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
|
876 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
|
877 #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
|
878 |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
879 /* 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
|
880 #define CHARSET_RANGE_TABLE_BITS(p) \ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
881 ((p)[2 + CHARSET_BITMAP_SIZE (p)] \ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
882 + (p)[3 + CHARSET_BITMAP_SIZE (p)] * 0x100) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
883 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
884 /* 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
|
885 #define CHARSET_LOOKUP_BITMAP(p, c) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
886 ((c) < CHARSET_BITMAP_SIZE (p) * BYTEWIDTH \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
887 && (p)[2 + (c) / BYTEWIDTH] & (1 << ((c) % BYTEWIDTH))) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
888 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
889 /* Return the address of end of RANGE_TABLE. COUNT is number of |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
890 ranges (which is a pair of (start, end)) in the RANGE_TABLE. `* 2' |
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
891 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
|
892 and end. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
893 #define CHARSET_RANGE_TABLE_END(range_table, count) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
894 ((range_table) + (count) * 2 * 3) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
895 |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
896 /* 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
|
897 COUNT is number of ranges in RANGE_TABLE. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
898 #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
|
899 do \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
900 { \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
901 re_wchar_t range_start, range_end; \ |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
902 re_char *p; \ |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
903 re_char *range_table_end \ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
904 = CHARSET_RANGE_TABLE_END ((range_table), (count)); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
905 \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
906 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
|
907 { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
908 EXTRACT_CHARACTER (range_start, p); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
909 EXTRACT_CHARACTER (range_end, p + 3); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
910 \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
911 if (range_start <= (c) && (c) <= range_end) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
912 { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
913 (not) = !(not); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
914 break; \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
915 } \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
916 } \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
917 } \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
918 while (0) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
919 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
920 /* 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
|
921 C is listed in it. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
922 #define CHARSET_LOOKUP_RANGE_TABLE(not, c, charset) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
923 do \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
924 { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
925 /* Number of ranges in range table. */ \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
926 int count; \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
927 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
|
928 \ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
929 EXTRACT_NUMBER_AND_INCR (count, range_table); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
930 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
|
931 } \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
932 while (0) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
933 |
11864
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 /* 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
|
935 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
|
936 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
|
937 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
|
938 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
|
939 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
940 #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
|
941 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
942 /* 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
|
943 # 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
|
944 |
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 /* 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
|
946 # 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
|
947 |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
948 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
|
949 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
950 # 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
|
951 # 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
|
952 # 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
|
953 # 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
|
954 # 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
|
955 # 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
|
956 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
|
957 # 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
|
958 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
|
959 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
960 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
961 /* 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
|
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 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
|
964 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
|
965 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
|
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 unsigned was_a_range = 0; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
968 unsigned i = 0; |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
969 |
11864
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 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
|
971 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
972 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
|
973 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
974 was_a_range = 0; |
18262 | 975 putchar (i - 1); |
976 while (i < (1 << BYTEWIDTH) && fastmap[i]) | |
977 { | |
978 was_a_range = 1; | |
979 i++; | |
980 } | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
981 if (was_a_range) |
18262 | 982 { |
983 printf ("-"); | |
984 putchar (i - 1); | |
985 } | |
986 } | |
11864
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 } |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
988 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
|
989 } |
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 |
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 /* 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
|
993 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
|
994 |
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 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
|
996 print_partial_compiled_pattern (start, end) |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
997 re_char *start; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
998 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
|
999 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1000 int mcnt, mcnt2; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1001 re_char *p = start; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1002 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
|
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 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
|
1005 { |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1006 fprintf (stderr, "(null)\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
|
1007 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
|
1008 } |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1009 |
11864
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 /* 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
|
1011 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
|
1012 { |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1013 fprintf (stderr, "%d:\t", p - 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
|
1014 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1015 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
|
1016 { |
18262 | 1017 case no_op: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1018 fprintf (stderr, "/no_op"); |
18262 | 1019 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
|
1020 |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1021 case succeed: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1022 fprintf (stderr, "/succeed"); |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1023 break; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1024 |
11864
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 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
|
1026 mcnt = *p++; |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1027 fprintf (stderr, "/exactn/%d", mcnt); |
18262 | 1028 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
|
1029 { |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1030 fprintf (stderr, "/%c", *p++); |
18262 | 1031 } |
1032 while (--mcnt); | |
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 start_memory: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1036 fprintf (stderr, "/start_memory/%d", *p++); |
18262 | 1037 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
|
1038 |
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 case stop_memory: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1040 fprintf (stderr, "/stop_memory/%d", *p++); |
18262 | 1041 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
|
1042 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1043 case duplicate: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1044 fprintf (stderr, "/duplicate/%d", *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
|
1045 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
|
1046 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1047 case anychar: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1048 fprintf (stderr, "/anychar"); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1049 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
|
1050 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1051 case charset: |
18262 | 1052 case charset_not: |
1053 { | |
1054 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
|
1055 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
|
1056 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
|
1057 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
|
1058 |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1059 fprintf (stderr, "/charset [%s", |
52838
246c94760bee
(MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents:
52680
diff
changeset
|
1060 (re_opcode_t) *(p - 1) == charset_not ? "^" : ""); |
246c94760bee
(MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents:
52680
diff
changeset
|
1061 |
246c94760bee
(MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents:
52680
diff
changeset
|
1062 if (p + *p >= pend) |
246c94760bee
(MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents:
52680
diff
changeset
|
1063 fprintf (stderr, " !extends past end of pattern! "); |
18262 | 1064 |
1065 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
|
1066 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
|
1067 && (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
|
1068 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1069 /* 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
|
1070 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
|
1071 { |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1072 fprintf (stderr, "-"); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1073 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
|
1074 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1075 /* 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
|
1076 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
|
1077 { |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1078 fprintf (stderr, "%c", last); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1079 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
|
1080 } |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1081 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1082 if (! in_range) |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1083 fprintf (stderr, "%c", 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
|
1084 |
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 last = c; |
18262 | 1086 } |
11864
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 |
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 if (in_range) |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1089 fprintf (stderr, "%c", last); |
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1090 |
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1091 fprintf (stderr, "]"); |
11864
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 |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1093 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
|
1094 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
1095 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
|
1096 { |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1097 int count; |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1098 fprintf (stderr, "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
|
1099 |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1100 /* ??? 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
|
1101 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
|
1102 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
|
1103 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
|
1104 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1105 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1106 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
|
1107 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1108 case begline: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1109 fprintf (stderr, "/begline"); |
18262 | 1110 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
|
1111 |
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 case endline: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1113 fprintf (stderr, "/endline"); |
18262 | 1114 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
|
1115 |
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 case on_failure_jump: |
18262 | 1117 extract_number_and_incr (&mcnt, &p); |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1118 fprintf (stderr, "/on_failure_jump to %d", p + mcnt - start); |
18262 | 1119 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
|
1120 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1121 case on_failure_keep_string_jump: |
18262 | 1122 extract_number_and_incr (&mcnt, &p); |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1123 fprintf (stderr, "/on_failure_keep_string_jump to %d", p + mcnt - start); |
18262 | 1124 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
|
1125 |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
1126 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
|
1127 extract_number_and_incr (&mcnt, &p); |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1128 fprintf (stderr, "/on_failure_jump_nastyloop to %d", p + mcnt - start); |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
1129 break; |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
1130 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1131 case on_failure_jump_loop: |
18262 | 1132 extract_number_and_incr (&mcnt, &p); |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1133 fprintf (stderr, "/on_failure_jump_loop to %d", p + mcnt - start); |
18262 | 1134 break; |
1135 | |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1136 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
|
1137 extract_number_and_incr (&mcnt, &p); |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1138 fprintf (stderr, "/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
|
1139 break; |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1140 |
18262 | 1141 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
|
1142 extract_number_and_incr (&mcnt, &p); |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1143 fprintf (stderr, "/jump to %d", p + mcnt - start); |
16010 | 1144 break; |
1145 | |
18262 | 1146 case succeed_n: |
1147 extract_number_and_incr (&mcnt, &p); | |
1148 extract_number_and_incr (&mcnt2, &p); | |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1149 fprintf (stderr, "/succeed_n to %d, %d times", p - 2 + mcnt - start, mcnt2); |
18262 | 1150 break; |
1151 | |
1152 case jump_n: | |
1153 extract_number_and_incr (&mcnt, &p); | |
1154 extract_number_and_incr (&mcnt2, &p); | |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1155 fprintf (stderr, "/jump_n to %d, %d times", p - 2 + mcnt - start, mcnt2); |
18262 | 1156 break; |
1157 | |
1158 case set_number_at: | |
1159 extract_number_and_incr (&mcnt, &p); | |
1160 extract_number_and_incr (&mcnt2, &p); | |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1161 fprintf (stderr, "/set_number_at location %d to %d", p - 2 + mcnt - start, mcnt2); |
18262 | 1162 break; |
1163 | |
1164 case wordbound: | |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1165 fprintf (stderr, "/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
|
1166 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
|
1167 |
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 case notwordbound: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1169 fprintf (stderr, "/notwordbound"); |
18262 | 1170 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
|
1171 |
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 case wordbeg: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1173 fprintf (stderr, "/wordbeg"); |
11864
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 break; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1175 |
11864
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 case wordend: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1177 fprintf (stderr, "/wordend"); |
55811
d8ee27fc17e9
(print_partial_compiled_pattern): Add missing 'break'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55690
diff
changeset
|
1178 break; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1179 |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
1180 case symbeg: |
55811
d8ee27fc17e9
(print_partial_compiled_pattern): Add missing 'break'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55690
diff
changeset
|
1181 fprintf (stderr, "/symbeg"); |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
1182 break; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
1183 |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
1184 case symend: |
55811
d8ee27fc17e9
(print_partial_compiled_pattern): Add missing 'break'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55690
diff
changeset
|
1185 fprintf (stderr, "/symend"); |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
1186 break; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
1187 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1188 case syntaxspec: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1189 fprintf (stderr, "/syntaxspec"); |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1190 mcnt = *p++; |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1191 fprintf (stderr, "/%d", mcnt); |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1192 break; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1193 |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1194 case notsyntaxspec: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1195 fprintf (stderr, "/notsyntaxspec"); |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1196 mcnt = *p++; |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1197 fprintf (stderr, "/%d", mcnt); |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1198 break; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1199 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1200 # 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
|
1201 case before_dot: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1202 fprintf (stderr, "/before_dot"); |
18262 | 1203 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
|
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 case at_dot: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1206 fprintf (stderr, "/at_dot"); |
18262 | 1207 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
|
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 case after_dot: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1210 fprintf (stderr, "/after_dot"); |
18262 | 1211 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
|
1212 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1213 case categoryspec: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1214 fprintf (stderr, "/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
|
1215 mcnt = *p++; |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1216 fprintf (stderr, "/%d", mcnt); |
18262 | 1217 break; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1218 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1219 case notcategoryspec: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1220 fprintf (stderr, "/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
|
1221 mcnt = *p++; |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1222 fprintf (stderr, "/%d", 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
|
1223 break; |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1224 # 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
|
1225 |
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 case begbuf: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1227 fprintf (stderr, "/begbuf"); |
18262 | 1228 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
|
1229 |
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 case endbuf: |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1231 fprintf (stderr, "/endbuf"); |
18262 | 1232 break; |
1233 | |
1234 default: | |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1235 fprintf (stderr, "?%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
|
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 |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1238 fprintf (stderr, "\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
|
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 |
49930
0f71486df5bc
(print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
1241 fprintf (stderr, "%d:\tend of pattern.\n", p - 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
|
1242 } |
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 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1245 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
|
1246 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
|
1247 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
|
1248 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1249 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
|
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 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
|
1252 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
|
1253 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
|
1254 |
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 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
|
1256 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1257 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
|
1258 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
|
1259 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1260 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1261 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
|
1262 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
|
1263 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
|
1264 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
|
1265 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
|
1266 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
|
1267 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
|
1268 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
|
1269 /* 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
|
1270 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1271 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1272 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1273 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
|
1274 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
|
1275 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
|
1276 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
|
1277 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
|
1278 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
|
1279 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
|
1280 { |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1281 int this_char; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1282 |
11864
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 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
|
1284 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
|
1285 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
|
1286 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1287 if (FIRST_STRING_P (where)) |
18262 | 1288 { |
1289 for (this_char = where - string1; this_char < size1; this_char++) | |
1290 putchar (string1[this_char]); | |
1291 | |
1292 where = string2; | |
1293 } | |
11864
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 |
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 for (this_char = where - string2; this_char < size2; this_char++) |
18262 | 1296 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
|
1297 } |
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 |
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 #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
|
1301 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1302 # undef assert |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1303 # define assert(e) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1304 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1305 # 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
|
1306 # 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
|
1307 # 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
|
1308 # 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
|
1309 # 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
|
1310 # 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
|
1311 # 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
|
1312 |
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 #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
|
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 /* 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
|
1316 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
|
1317 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
|
1318 /* 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
|
1319 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
|
1320 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
|
1321 |
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 |
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 /* 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
|
1324 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
|
1325 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
|
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 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
|
1328 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
|
1329 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1330 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
|
1331 re_set_syntax (syntax) |
58325
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
1332 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
|
1333 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1334 reg_syntax_t ret = re_syntax_options; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1335 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1336 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
|
1337 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
|
1338 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
1339 WEAK_ALIAS (__re_set_syntax, re_set_syntax) |
58325
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
1340 |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
1341 /* Regexp to use to replace spaces, or NULL meaning don't. */ |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
1342 static re_char *whitespace_regexp; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
1343 |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
1344 void |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
1345 re_set_whitespace_regexp (regexp) |
65817
251409bdae6a
(re_char): Move it back to the implementation file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65764
diff
changeset
|
1346 const char *regexp; |
58325
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
1347 { |
65817
251409bdae6a
(re_char): Move it back to the implementation file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65764
diff
changeset
|
1348 whitespace_regexp = (re_char *) regexp; |
58325
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
1349 } |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
1350 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
|
1351 |
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 /* 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
|
1353 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
|
1354 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
|
1355 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
|
1356 |
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 static const char *re_error_msgid[] = |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1358 { |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1359 gettext_noop ("Success"), /* REG_NOERROR */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1360 gettext_noop ("No match"), /* REG_NOMATCH */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1361 gettext_noop ("Invalid regular expression"), /* REG_BADPAT */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1362 gettext_noop ("Invalid collation character"), /* REG_ECOLLATE */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1363 gettext_noop ("Invalid character class name"), /* REG_ECTYPE */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1364 gettext_noop ("Trailing backslash"), /* REG_EESCAPE */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1365 gettext_noop ("Invalid back reference"), /* REG_ESUBREG */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1366 gettext_noop ("Unmatched [ or [^"), /* REG_EBRACK */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1367 gettext_noop ("Unmatched ( or \\("), /* REG_EPAREN */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1368 gettext_noop ("Unmatched \\{"), /* REG_EBRACE */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1369 gettext_noop ("Invalid content of \\{\\}"), /* REG_BADBR */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1370 gettext_noop ("Invalid range end"), /* REG_ERANGE */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1371 gettext_noop ("Memory exhausted"), /* REG_ESPACE */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1372 gettext_noop ("Invalid preceding regular expression"), /* REG_BADRPT */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1373 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
|
1374 gettext_noop ("Regular expression too big"), /* REG_ESIZE */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1375 gettext_noop ("Unmatched ) or \\)"), /* REG_ERPAREN */ |
57665
b8ccc605c96d
(re_error_msgid): Add an entry for REG_ERANGEX.
Kenichi Handa <handa@m17n.org>
parents:
56091
diff
changeset
|
1376 gettext_noop ("Range striding over charsets") /* REG_ERANGEX */ |
11864
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 }; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1378 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1379 /* 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
|
1380 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1381 /* 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
|
1382 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
|
1383 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
|
1384 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
|
1385 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
|
1386 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
|
1387 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
|
1388 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1389 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
|
1390 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
|
1391 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
|
1392 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
|
1393 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
|
1394 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
|
1395 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
|
1396 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
|
1397 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1398 /* 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
|
1399 #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
|
1400 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1401 /* 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
|
1402 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
|
1403 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
|
1404 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
|
1405 so REL_ALLOC should not affect this. */ |
84493
70ea273ac237
(C_ALLOCA): Remove all references and code that was only used when
Glenn Morris <rgm@gnu.org>
parents:
82365
diff
changeset
|
1406 #if defined REGEX_MALLOC && defined emacs |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1407 # 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
|
1408 #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
|
1409 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1410 |
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 /* 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
|
1412 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
|
1413 REGEX_ALLOCATE_STACK. */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1414 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1415 |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1416 /* 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
|
1417 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
|
1418 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
|
1419 #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
|
1420 # 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
|
1421 #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
|
1422 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1423 /* 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
|
1424 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
|
1425 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
|
1426 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
|
1427 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
|
1428 # 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
|
1429 /* 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
|
1430 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
|
1431 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
|
1432 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
|
1433 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
|
1434 # else |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
1435 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
|
1436 # 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
|
1437 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1438 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
|
1439 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1440 re_char *pointer; |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
1441 /* 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
|
1442 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
|
1443 }; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1444 |
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 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
|
1446 |
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 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
|
1448 { |
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 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
|
1450 size_t size; |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
1451 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
|
1452 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
|
1453 } 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
|
1454 |
28062
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 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
|
1456 #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
|
1457 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1458 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1459 /* 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
|
1460 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
|
1461 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1462 #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
|
1463 # 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
|
1464 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
|
1465 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
|
1466 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
|
1467 * 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
|
1468 \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1469 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
|
1470 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
|
1471 \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1472 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
|
1473 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
|
1474 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
|
1475 } 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
|
1476 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1477 # 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
|
1478 #else |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1479 # 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
|
1480 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
|
1481 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
|
1482 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
|
1483 } 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
|
1484 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1485 # 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
|
1486 #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
|
1487 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1488 |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1489 /* 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
|
1490 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
|
1491 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1492 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
|
1493 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
|
1494 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1495 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
|
1496 |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1497 /* 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
|
1498 when we increase it. |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1499 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
|
1500 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
|
1501 were as ultimate, maximum-size stack. */ |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1502 #define FAIL_STACK_GROWTH_FACTOR 4 |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1503 |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1504 #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
|
1505 (((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
|
1506 >= 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
|
1507 ? 0 \ |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1508 : ((fail_stack).stack \ |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1509 = (fail_stack_elt_t *) \ |
18262 | 1510 REGEX_REALLOCATE_STACK ((fail_stack).stack, \ |
1511 (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
|
1512 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
|
1513 ((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
|
1514 * 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
|
1515 \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1516 (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
|
1517 ? 0 \ |
20450
8f05356e9dc3
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
20449
diff
changeset
|
1518 : ((fail_stack).size \ |
8f05356e9dc3
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
20449
diff
changeset
|
1519 = (MIN (re_max_failures * TYPICAL_FAILURE_SIZE, \ |
8f05356e9dc3
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
20449
diff
changeset
|
1520 ((fail_stack).size * sizeof (fail_stack_elt_t) \ |
8f05356e9dc3
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
20449
diff
changeset
|
1521 * FAIL_STACK_GROWTH_FACTOR)) \ |
8f05356e9dc3
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
20449
diff
changeset
|
1522 / sizeof (fail_stack_elt_t)), \ |
18262 | 1523 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
|
1524 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1525 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1526 /* 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
|
1527 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
|
1528 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
|
1529 #define PUSH_FAILURE_POINTER(item) \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1530 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
|
1531 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1532 /* 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
|
1533 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
|
1534 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
|
1535 #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
|
1536 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
|
1537 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1538 /* 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
|
1539 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
|
1540 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
|
1541 #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
|
1542 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
|
1543 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1544 /* 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
|
1545 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
|
1546 #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
|
1547 #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
|
1548 #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
|
1549 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1550 /* 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
|
1551 #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
|
1552 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1553 /* 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
|
1554 #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
|
1555 #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
|
1556 #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
|
1557 #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
|
1558 |
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 #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
|
1561 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
|
1562 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
|
1563 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
|
1564 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
|
1565 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
|
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 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1568 /* 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
|
1569 #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
|
1570 do { \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1571 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
|
1572 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
|
1573 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
|
1574 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
|
1575 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
|
1576 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
|
1577 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
|
1578 } 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
|
1579 |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1580 /* 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
|
1581 be reset when backtracking. */ |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1582 #define PUSH_NUMBER(ptr,val) \ |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1583 do { \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1584 char *destination; \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1585 int c; \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1586 ENSURE_FAIL_STACK(3); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1587 EXTRACT_NUMBER (c, ptr); \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1588 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
|
1589 PUSH_FAILURE_INT (c); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1590 PUSH_FAILURE_POINTER (ptr); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1591 PUSH_FAILURE_INT (-1); \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1592 STORE_NUMBER (ptr, val); \ |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1593 } while (0) |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1594 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1595 /* Pop a saved register off the stack. */ |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1596 #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
|
1597 do { \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1598 int reg = POP_FAILURE_INT (); \ |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1599 if (reg == -1) \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1600 { \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1601 /* 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
|
1602 /* 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
|
1603 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
|
1604 reg = POP_FAILURE_INT (); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1605 STORE_NUMBER (ptr, reg); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1606 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
|
1607 } \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1608 else \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1609 { \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1610 regend[reg] = POP_FAILURE_POINTER (); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1611 regstart[reg] = POP_FAILURE_POINTER (); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1612 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
|
1613 reg, regstart[reg], regend[reg]); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1614 } \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1615 } 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
|
1616 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1617 /* 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
|
1618 #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
|
1619 do { \ |
44063
fd6c1f8ebd4e
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
40650
diff
changeset
|
1620 int failure = TOP_FAILURE_HANDLE (); \ |
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 /* Check for infinite matching loops */ \ |
44063
fd6c1f8ebd4e
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
40650
diff
changeset
|
1622 while (failure > 0 \ |
fd6c1f8ebd4e
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
40650
diff
changeset
|
1623 && (FAILURE_STR (failure) == string_place \ |
fd6c1f8ebd4e
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
40650
diff
changeset
|
1624 || FAILURE_STR (failure) == NULL)) \ |
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 { \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1626 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
|
1627 && 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
|
1628 if (FAILURE_PAT (failure) == pat_cur) \ |
44063
fd6c1f8ebd4e
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
40650
diff
changeset
|
1629 { \ |
47368
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
1630 cycle = 1; \ |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
1631 break; \ |
44063
fd6c1f8ebd4e
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
40650
diff
changeset
|
1632 } \ |
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
|
1633 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
|
1634 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
|
1635 } \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1636 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
|
1637 } while (0) |
47368
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
1638 |
11864
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 /* 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
|
1640 if we ever fail back to it. |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1641 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1642 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
|
1643 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
|
1644 declared. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1645 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1646 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
|
1647 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1648 #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
|
1649 do { \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1650 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
|
1651 /* 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
|
1652 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
|
1653 \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1654 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
|
1655 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
|
1656 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
|
1657 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
|
1658 \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1659 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
|
1660 \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1661 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
|
1662 \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1663 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
|
1664 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
|
1665 \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1666 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
|
1667 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
|
1668 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
|
1669 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
|
1670 \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1671 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
|
1672 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
|
1673 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
|
1674 \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1675 /* 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
|
1676 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
|
1677 } 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
|
1678 |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1679 /* 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
|
1680 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
|
1681 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
|
1682 /* 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
|
1683 #define TYPICAL_FAILURE_SIZE 20 |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1684 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1685 /* 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
|
1686 #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
|
1687 |
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 /* 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
|
1690 |
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 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
|
1692 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
|
1693 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
|
1694 REGSTART, REGEND -- arrays of string positions. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1695 |
11864
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 Also assumes the variables `fail_stack' and (if debugging), `bufp', |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
1697 `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
|
1698 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1699 #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
|
1700 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
|
1701 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
|
1702 \ |
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 /* 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
|
1704 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
|
1705 DEBUG_PRINT2 (" Before pop, next avail: %d\n", fail_stack.avail); \ |
18262 | 1706 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
|
1707 \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1708 /* 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
|
1709 while (fail_stack.frame < fail_stack.avail) \ |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1710 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
|
1711 \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1712 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
|
1713 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
|
1714 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
|
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 /* 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
|
1717 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
|
1718 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
|
1719 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
|
1720 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
|
1721 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
|
1722 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
|
1723 \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1724 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
|
1725 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
|
1726 \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1727 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
|
1728 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
|
1729 \ |
11864
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 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
|
1731 } 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
|
1732 |
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 |
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 |
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 /* 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
|
1736 #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
|
1737 |
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 /* 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
|
1739 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1740 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
|
1741 reg_syntax_t syntax, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1742 struct re_pattern_buffer *bufp)); |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1743 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
|
1744 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
|
1745 int arg1, int arg2)); |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1746 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
|
1747 int arg, unsigned char *end)); |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1748 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
|
1749 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
|
1750 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
|
1751 re_char *p, |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1752 reg_syntax_t syntax)); |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1753 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
|
1754 re_char *pend, |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1755 reg_syntax_t syntax)); |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1756 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
|
1757 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
|
1758 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
|
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 /* 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
|
1761 translation. */ |
47008
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
1762 #define PATFETCH(c) \ |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
1763 do { \ |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
1764 int len; \ |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
1765 if (p == pend) return REG_EEND; \ |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
1766 c = RE_STRING_CHAR_AND_LENGTH (p, pend - p, len, multibyte); \ |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
1767 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
|
1768 } 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
|
1769 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1770 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1771 /* 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
|
1772 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
|
1773 `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
|
1774 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
|
1775 #ifndef TRANSLATE |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1776 # 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
|
1777 (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
|
1778 #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
|
1779 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1780 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1781 /* 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
|
1782 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1783 /* 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
|
1784 #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
|
1785 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1786 /* 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
|
1787 #define GET_BUFFER_SPACE(n) \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1788 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
|
1789 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
|
1790 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1791 /* 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
|
1792 #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
|
1793 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
|
1794 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
|
1795 *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
|
1796 } 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
|
1797 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1798 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1799 /* 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
|
1800 #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
|
1801 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
|
1802 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
|
1803 *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
|
1804 *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
|
1805 } 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
|
1806 |
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 /* 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
|
1809 #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
|
1810 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
|
1811 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
|
1812 *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
|
1813 *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
|
1814 *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
|
1815 } 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
|
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 |
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 /* 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
|
1819 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
|
1820 #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
|
1821 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
|
1822 |
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 /* 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
|
1824 #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
|
1825 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
|
1826 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1827 /* 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
|
1828 #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
|
1829 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
|
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 /* 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
|
1832 #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
|
1833 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
|
1834 |
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 |
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 /* This is not an arbitrary limit: the arguments which represent offsets |
52838
246c94760bee
(MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents:
52680
diff
changeset
|
1837 into the pattern are two bytes long. So if 2^15 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
|
1838 be too small, many things would have to change. */ |
52838
246c94760bee
(MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents:
52680
diff
changeset
|
1839 # define MAX_BUF_SIZE (1L << 15) |
246c94760bee
(MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents:
52680
diff
changeset
|
1840 |
246c94760bee
(MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents:
52680
diff
changeset
|
1841 #if 0 /* This is when we thought it could be 2^16 bytes. */ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1842 /* 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
|
1843 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
|
1844 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
|
1845 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
|
1846 You have been warned!! */ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1847 #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
|
1848 /* 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
|
1849 # define MAX_BUF_SIZE 65500L |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1850 #else |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1851 # 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
|
1852 #endif |
52838
246c94760bee
(MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents:
52680
diff
changeset
|
1853 #endif /* 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
|
1854 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1855 /* 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
|
1856 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
|
1857 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
|
1858 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
|
1859 #if __BOUNDED_POINTERS__ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1860 # 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
|
1861 # define MOVE_BUFFER_POINTER(P) \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1862 (__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
|
1863 # 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
|
1864 else \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1865 { \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1866 SET_HIGH_BOUND (b); \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1867 SET_HIGH_BOUND (begalt); \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1868 if (fixup_alt_jump) \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1869 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
|
1870 if (laststart) \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1871 SET_HIGH_BOUND (laststart); \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1872 if (pending_exact) \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1873 SET_HIGH_BOUND (pending_exact); \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1874 } |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1875 #else |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1876 # 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
|
1877 # 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
|
1878 #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
|
1879 #define EXTEND_BUFFER() \ |
18262 | 1880 do { \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1881 re_char *old_buffer = bufp->buffer; \ |
18262 | 1882 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
|
1883 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
|
1884 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
|
1885 if (bufp->allocated > MAX_BUF_SIZE) \ |
18262 | 1886 bufp->allocated = MAX_BUF_SIZE; \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1887 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
|
1888 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
|
1889 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
|
1890 /* 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
|
1891 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
|
1892 { \ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1893 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
|
1894 MOVE_BUFFER_POINTER (b); \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1895 MOVE_BUFFER_POINTER (begalt); \ |
18262 | 1896 if (fixup_alt_jump) \ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1897 MOVE_BUFFER_POINTER (fixup_alt_jump); \ |
18262 | 1898 if (laststart) \ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1899 MOVE_BUFFER_POINTER (laststart); \ |
18262 | 1900 if (pending_exact) \ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1901 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
|
1902 } \ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1903 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
|
1904 } 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
|
1905 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1906 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1907 /* 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
|
1908 {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
|
1909 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
|
1910 #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
|
1911 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1912 /* 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
|
1913 ignore the excess. */ |
47337
a4b9dff21d74
(regnum_t): Use signed int, not unsigned int.
Richard M. Stallman <rms@gnu.org>
parents:
47250
diff
changeset
|
1914 typedef int regnum_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
|
1915 |
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 /* 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
|
1918 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1919 /* 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
|
1920 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
|
1921 /* 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
|
1922 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
|
1923 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1924 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
|
1925 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1926 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
|
1927 pattern_offset_t fixup_alt_jump; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1928 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
|
1929 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
|
1930 } 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
|
1931 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1932 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1933 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
|
1934 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1935 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
|
1936 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
|
1937 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
|
1938 } 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
|
1939 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1940 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1941 #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
|
1942 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1943 #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
|
1944 #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
|
1945 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1946 /* 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
|
1947 #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
|
1948 |
68371
05d6eb9afa08
(IMMEDIATE_QUIT_CHECK): Use it with SYNC_INPUT as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65817
diff
changeset
|
1949 /* Explicit quit checking is only used on NTemacs and whenever we |
05d6eb9afa08
(IMMEDIATE_QUIT_CHECK): Use it with SYNC_INPUT as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65817
diff
changeset
|
1950 use polling to process input events. */ |
05d6eb9afa08
(IMMEDIATE_QUIT_CHECK): Use it with SYNC_INPUT as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65817
diff
changeset
|
1951 #if defined emacs && (defined WINDOWSNT || defined SYNC_INPUT) && defined QUIT |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1952 extern int immediate_quit; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1953 # define IMMEDIATE_QUIT_CHECK \ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1954 do { \ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1955 if (immediate_quit) QUIT; \ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1956 } while (0) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1957 #else |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1958 # define IMMEDIATE_QUIT_CHECK ((void)0) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1959 #endif |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1960 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1961 /* Structure to manage work area for range table. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1962 struct range_table_work_area |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1963 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1964 int *table; /* actual work area. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1965 int allocated; /* allocated size for work area in bytes. */ |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
1966 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
|
1967 int bits; /* flag to record character classes */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1968 }; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1969 |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1970 /* Make sure that WORK_AREA can hold more N multibyte characters. |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1971 This is used only in set_image_of_range and set_image_of_range_1. |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1972 It expects WORK_AREA to be a pointer. |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1973 If it can't get the space, it returns from the surrounding function. */ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1974 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1975 #define EXTEND_RANGE_TABLE(work_area, n) \ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1976 do { \ |
89483 | 1977 if (((work_area).used + (n)) * sizeof (int) > (work_area).allocated) \ |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1978 { \ |
89483 | 1979 extend_range_table_work_area (&work_area); \ |
1980 if ((work_area).table == 0) \ | |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1981 return (REG_ESPACE); \ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1982 } \ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1983 } while (0) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1984 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
1985 #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
|
1986 (work_area).bits |= (bit) |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
1987 |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1988 /* 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
|
1989 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
|
1990 #define BIT_WORD 0x1 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1991 #define BIT_LOWER 0x2 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1992 #define BIT_PUNCT 0x4 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1993 #define BIT_SPACE 0x8 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1994 #define BIT_UPPER 0x10 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1995 #define BIT_MULTIBYTE 0x20 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
1996 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1997 /* 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
|
1998 #define SET_RANGE_TABLE_WORK_AREA(work_area, range_start, range_end) \ |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
1999 do { \ |
89483 | 2000 EXTEND_RANGE_TABLE ((work_area), 2); \ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2001 (work_area).table[(work_area).used++] = (range_start); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2002 (work_area).table[(work_area).used++] = (range_end); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2003 } while (0) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2004 |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
2005 /* Free allocated memory for WORK_AREA. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2006 #define FREE_RANGE_TABLE_WORK_AREA(work_area) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2007 do { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2008 if ((work_area).table) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2009 free ((work_area).table); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2010 } while (0) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2011 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2012 #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
|
2013 #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
|
2014 #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
|
2015 #define RANGE_TABLE_WORK_ELT(work_area, i) ((work_area).table[i]) |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2016 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2017 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2018 /* 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
|
2019 #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
|
2020 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2021 |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
2022 #ifdef emacs |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
2023 |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2024 /* Store characters in the range FROM to TO in the bitmap at B (for |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2025 ASCII and unibyte characters) and WORK_AREA (for multibyte |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2026 characters) while translating them and paying attention to the |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2027 continuity of translated characters. |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2028 |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2029 Implementation note: It is better to implement these fairly big |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2030 macros by a function, but it's not that easy because macros called |
89483 | 2031 in this macro assume various local variables already declared. */ |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
2032 |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2033 /* Both FROM and TO are ASCII characters. */ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2034 |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2035 #define SETUP_ASCII_RANGE(work_area, FROM, TO) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2036 do { \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2037 int C0, C1; \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2038 \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2039 for (C0 = (FROM); C0 <= (TO); C0++) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2040 { \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2041 C1 = TRANSLATE (C0); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2042 if (! ASCII_CHAR_P (C1)) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2043 { \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2044 SET_RANGE_TABLE_WORK_AREA ((work_area), C1, C1); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2045 if ((C1 = RE_CHAR_TO_UNIBYTE (C1)) < 0) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2046 C1 = C0; \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2047 } \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2048 SET_LIST_BIT (C1); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2049 } \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2050 } while (0) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2051 |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2052 |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2053 /* Both FROM and TO are unibyte characters (0x80..0xFF). */ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2054 |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2055 #define SETUP_UNIBYTE_RANGE(work_area, FROM, TO) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2056 do { \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2057 int C0, C1, C2, I; \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2058 int USED = RANGE_TABLE_WORK_USED (work_area); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2059 \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2060 for (C0 = (FROM); C0 <= (TO); C0++) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2061 { \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2062 C1 = RE_CHAR_TO_MULTIBYTE (C0); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2063 if (CHAR_BYTE8_P (C1)) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2064 SET_LIST_BIT (C0); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2065 else \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2066 { \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2067 C2 = TRANSLATE (C1); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2068 if (C2 == C1 \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2069 || (C1 = RE_CHAR_TO_UNIBYTE (C2)) < 0) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2070 C1 = C0; \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2071 SET_LIST_BIT (C1); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2072 for (I = RANGE_TABLE_WORK_USED (work_area) - 2; I >= USED; I -= 2) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2073 { \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2074 int from = RANGE_TABLE_WORK_ELT (work_area, I); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2075 int to = RANGE_TABLE_WORK_ELT (work_area, I + 1); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2076 \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2077 if (C2 >= from - 1 && C2 <= to + 1) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2078 { \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2079 if (C2 == from - 1) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2080 RANGE_TABLE_WORK_ELT (work_area, I)--; \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2081 else if (C2 == to + 1) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2082 RANGE_TABLE_WORK_ELT (work_area, I + 1)++; \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2083 break; \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2084 } \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2085 } \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2086 if (I < USED) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2087 SET_RANGE_TABLE_WORK_AREA ((work_area), C2, C2); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2088 } \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2089 } \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2090 } while (0) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2091 |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2092 |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2093 /* Both FROM and TO are mulitbyte characters. */ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2094 |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2095 #define SETUP_MULTIBYTE_RANGE(work_area, FROM, TO) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2096 do { \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2097 int C0, C1, C2, I, USED = RANGE_TABLE_WORK_USED (work_area); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2098 \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2099 SET_RANGE_TABLE_WORK_AREA ((work_area), (FROM), (TO)); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2100 for (C0 = (FROM); C0 <= (TO); C0++) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2101 { \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2102 C1 = TRANSLATE (C0); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2103 if ((C2 = RE_CHAR_TO_UNIBYTE (C1)) >= 0 \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2104 || (C1 != C0 && (C2 = RE_CHAR_TO_UNIBYTE (C0)) >= 0)) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2105 SET_LIST_BIT (C2); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2106 if (C1 >= (FROM) && C1 <= (TO)) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2107 continue; \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2108 for (I = RANGE_TABLE_WORK_USED (work_area) - 2; I >= USED; I -= 2) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2109 { \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2110 int from = RANGE_TABLE_WORK_ELT (work_area, I); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2111 int to = RANGE_TABLE_WORK_ELT (work_area, I + 1); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2112 \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2113 if (C1 >= from - 1 && C1 <= to + 1) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2114 { \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2115 if (C1 == from - 1) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2116 RANGE_TABLE_WORK_ELT (work_area, I)--; \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2117 else if (C1 == to + 1) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2118 RANGE_TABLE_WORK_ELT (work_area, I + 1)++; \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2119 break; \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2120 } \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2121 } \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2122 if (I < USED) \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2123 SET_RANGE_TABLE_WORK_AREA ((work_area), C1, C1); \ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2124 } \ |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
2125 } while (0) |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
2126 |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
2127 #endif /* emacs */ |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
2128 |
11864
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 /* Get the next unsigned number in the uncompiled pattern. */ |
18262 | 2130 #define GET_UNSIGNED_NUMBER(num) \ |
58784
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2131 do { \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2132 if (p == pend) \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2133 FREE_STACK_RETURN (REG_EBRACE); \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2134 else \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2135 { \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2136 PATFETCH (c); \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2137 while ('0' <= c && c <= '9') \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2138 { \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2139 int prev; \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2140 if (num < 0) \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2141 num = 0; \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2142 prev = num; \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2143 num = num * 10 + c - '0'; \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2144 if (num / 10 != prev) \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2145 FREE_STACK_RETURN (REG_BADBR); \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2146 if (p == pend) \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2147 FREE_STACK_RETURN (REG_EBRACE); \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2148 PATFETCH (c); \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2149 } \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2150 } \ |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
2151 } while (0) |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2152 |
56091
10b16f7f1a51
(re_wctype, re_iswctype): Function defs longer static.
Richard M. Stallman <rms@gnu.org>
parents:
55811
diff
changeset
|
2153 #if ! WIDE_CHAR_SUPPORT |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
2154 |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2155 /* Map a string to the char class it names (if any). */ |
56091
10b16f7f1a51
(re_wctype, re_iswctype): Function defs longer static.
Richard M. Stallman <rms@gnu.org>
parents:
55811
diff
changeset
|
2156 re_wctype_t |
40650
ded4aa3c81b2
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39718
diff
changeset
|
2157 re_wctype (str) |
ded4aa3c81b2
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39718
diff
changeset
|
2158 re_char *str; |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2159 { |
40650
ded4aa3c81b2
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39718
diff
changeset
|
2160 const char *string = str; |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2161 if (STREQ (string, "alnum")) return RECC_ALNUM; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2162 else if (STREQ (string, "alpha")) return RECC_ALPHA; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2163 else if (STREQ (string, "word")) return RECC_WORD; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2164 else if (STREQ (string, "ascii")) return RECC_ASCII; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2165 else if (STREQ (string, "nonascii")) return RECC_NONASCII; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2166 else if (STREQ (string, "graph")) return RECC_GRAPH; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2167 else if (STREQ (string, "lower")) return RECC_LOWER; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2168 else if (STREQ (string, "print")) return RECC_PRINT; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2169 else if (STREQ (string, "punct")) return RECC_PUNCT; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2170 else if (STREQ (string, "space")) return RECC_SPACE; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2171 else if (STREQ (string, "upper")) return RECC_UPPER; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2172 else if (STREQ (string, "unibyte")) return RECC_UNIBYTE; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2173 else if (STREQ (string, "multibyte")) return RECC_MULTIBYTE; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2174 else if (STREQ (string, "digit")) return RECC_DIGIT; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2175 else if (STREQ (string, "xdigit")) return RECC_XDIGIT; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2176 else if (STREQ (string, "cntrl")) return RECC_CNTRL; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2177 else if (STREQ (string, "blank")) return RECC_BLANK; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2178 else return 0; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2179 } |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2180 |
78501 | 2181 /* True if CH is in the char class CC. */ |
56091
10b16f7f1a51
(re_wctype, re_iswctype): Function defs longer static.
Richard M. Stallman <rms@gnu.org>
parents:
55811
diff
changeset
|
2182 boolean |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2183 re_iswctype (ch, cc) |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2184 int ch; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2185 re_wctype_t cc; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2186 { |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2187 switch (cc) |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2188 { |
33066
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2189 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
|
2190 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
|
2191 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
|
2192 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
|
2193 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
|
2194 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
|
2195 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
|
2196 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
|
2197 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
|
2198 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
|
2199 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
|
2200 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
|
2201 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
|
2202 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
|
2203 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
|
2204 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
|
2205 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
|
2206 case RECC_ERROR: return false; |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2207 default: |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2208 abort(); |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2209 } |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2210 } |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2211 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2212 /* 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
|
2213 chars of class CC. */ |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2214 static int |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2215 re_wctype_to_bit (cc) |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2216 re_wctype_t cc; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2217 { |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2218 switch (cc) |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2219 { |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2220 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
|
2221 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
|
2222 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
|
2223 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
|
2224 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
|
2225 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
|
2226 case RECC_SPACE: return BIT_SPACE; |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2227 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
|
2228 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
|
2229 default: |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2230 abort(); |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2231 } |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2232 } |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2233 #endif |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2234 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2235 /* Filling in the work area of a range. */ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2236 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2237 /* Actually extend the space in WORK_AREA. */ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2238 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2239 static void |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2240 extend_range_table_work_area (work_area) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2241 struct range_table_work_area *work_area; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49276
diff
changeset
|
2242 { |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2243 work_area->allocated += 16 * sizeof (int); |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2244 if (work_area->table) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2245 work_area->table |
69039
f717c65a39d7
* regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
69038
diff
changeset
|
2246 = (int *) realloc (work_area->table, work_area->allocated); |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2247 else |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2248 work_area->table |
69039
f717c65a39d7
* regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
69038
diff
changeset
|
2249 = (int *) malloc (work_area->allocated); |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2250 } |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2251 |
89483 | 2252 #if 0 |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2253 #ifdef emacs |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2254 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2255 /* Carefully find the ranges of codes that are equivalent |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2256 under case conversion to the range start..end when passed through |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2257 TRANSLATE. Handle the case where non-letters can come in between |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2258 two upper-case letters (which happens in Latin-1). |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2259 Also handle the case of groups of more than 2 case-equivalent chars. |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2260 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2261 The basic method is to look at consecutive characters and see |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2262 if they can form a run that can be handled as one. |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2263 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2264 Returns -1 if successful, REG_ESPACE if ran out of space. */ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2265 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2266 static int |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2267 set_image_of_range_1 (work_area, start, end, translate) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2268 RE_TRANSLATE_TYPE translate; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2269 struct range_table_work_area *work_area; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2270 re_wchar_t start, end; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2271 { |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2272 /* `one_case' indicates a character, or a run of characters, |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2273 each of which is an isolate (no case-equivalents). |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2274 This includes all ASCII non-letters. |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2275 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2276 `two_case' indicates a character, or a run of characters, |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2277 each of which has two case-equivalent forms. |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2278 This includes all ASCII letters. |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2279 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2280 `strange' indicates a character that has more than one |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2281 case-equivalent. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49276
diff
changeset
|
2282 |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2283 enum case_type {one_case, two_case, strange}; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2284 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2285 /* Describe the run that is in progress, |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2286 which the next character can try to extend. |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2287 If run_type is strange, that means there really is no run. |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2288 If run_type is one_case, then run_start...run_end is the run. |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2289 If run_type is two_case, then the run is run_start...run_end, |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2290 and the case-equivalents end at run_eqv_end. */ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2291 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2292 enum case_type run_type = strange; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2293 int run_start, run_end, run_eqv_end; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2294 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2295 Lisp_Object eqv_table; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2296 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2297 if (!RE_TRANSLATE_P (translate)) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2298 { |
47250
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2299 EXTEND_RANGE_TABLE (work_area, 2); |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2300 work_area->table[work_area->used++] = (start); |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2301 work_area->table[work_area->used++] = (end); |
47250
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2302 return -1; |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2303 } |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2304 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2305 eqv_table = XCHAR_TABLE (translate)->extras[2]; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2306 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2307 for (; start <= end; start++) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2308 { |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2309 enum case_type this_type; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2310 int eqv = RE_TRANSLATE (eqv_table, start); |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2311 int minchar, maxchar; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2312 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2313 /* Classify this character */ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2314 if (eqv == start) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2315 this_type = one_case; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2316 else if (RE_TRANSLATE (eqv_table, eqv) == start) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2317 this_type = two_case; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2318 else |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2319 this_type = strange; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2320 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2321 if (start < eqv) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2322 minchar = start, maxchar = eqv; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2323 else |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2324 minchar = eqv, maxchar = start; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2325 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2326 /* Can this character extend the run in progress? */ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2327 if (this_type == strange || this_type != run_type |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2328 || !(minchar == run_end + 1 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2329 && (run_type == two_case |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2330 ? maxchar == run_eqv_end + 1 : 1))) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2331 { |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2332 /* No, end the run. |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2333 Record each of its equivalent ranges. */ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2334 if (run_type == one_case) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2335 { |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2336 EXTEND_RANGE_TABLE (work_area, 2); |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2337 work_area->table[work_area->used++] = run_start; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2338 work_area->table[work_area->used++] = run_end; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2339 } |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2340 else if (run_type == two_case) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2341 { |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2342 EXTEND_RANGE_TABLE (work_area, 4); |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2343 work_area->table[work_area->used++] = run_start; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2344 work_area->table[work_area->used++] = run_end; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2345 work_area->table[work_area->used++] |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2346 = RE_TRANSLATE (eqv_table, run_start); |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2347 work_area->table[work_area->used++] |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2348 = RE_TRANSLATE (eqv_table, run_end); |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2349 } |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2350 run_type = strange; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2351 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49276
diff
changeset
|
2352 |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2353 if (this_type == strange) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2354 { |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2355 /* For a strange character, add each of its equivalents, one |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2356 by one. Don't start a range. */ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2357 do |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2358 { |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2359 EXTEND_RANGE_TABLE (work_area, 2); |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2360 work_area->table[work_area->used++] = eqv; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2361 work_area->table[work_area->used++] = eqv; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2362 eqv = RE_TRANSLATE (eqv_table, eqv); |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2363 } |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2364 while (eqv != start); |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2365 } |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2366 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2367 /* Add this char to the run, or start a new run. */ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2368 else if (run_type == strange) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2369 { |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2370 /* Initialize a new range. */ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2371 run_type = this_type; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2372 run_start = start; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2373 run_end = start; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2374 run_eqv_end = RE_TRANSLATE (eqv_table, run_end); |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2375 } |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2376 else |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2377 { |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2378 /* Extend a running range. */ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2379 run_end = minchar; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2380 run_eqv_end = RE_TRANSLATE (eqv_table, run_end); |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2381 } |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2382 } |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2383 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2384 /* If a run is still in progress at the end, finish it now |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2385 by recording its equivalent ranges. */ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2386 if (run_type == one_case) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2387 { |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2388 EXTEND_RANGE_TABLE (work_area, 2); |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2389 work_area->table[work_area->used++] = run_start; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2390 work_area->table[work_area->used++] = run_end; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2391 } |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2392 else if (run_type == two_case) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2393 { |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2394 EXTEND_RANGE_TABLE (work_area, 4); |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2395 work_area->table[work_area->used++] = run_start; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2396 work_area->table[work_area->used++] = run_end; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2397 work_area->table[work_area->used++] |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2398 = RE_TRANSLATE (eqv_table, run_start); |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2399 work_area->table[work_area->used++] |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2400 = RE_TRANSLATE (eqv_table, run_end); |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2401 } |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2402 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2403 return -1; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2404 } |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2405 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2406 #endif /* emacs */ |
47008
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
2407 |
47250
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2408 /* Record the the image of the range start..end when passed through |
47008
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
2409 TRANSLATE. This is not necessarily TRANSLATE(start)..TRANSLATE(end) |
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
2410 and is not even necessarily contiguous. |
47250
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2411 Normally we approximate it with the smallest contiguous range that contains |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2412 all the chars we need. However, for Latin-1 we go to extra effort |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2413 to do a better job. |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2414 |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2415 This function is not called for ASCII ranges. |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2416 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2417 Returns -1 if successful, REG_ESPACE if ran out of space. */ |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2418 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2419 static int |
47008
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
2420 set_image_of_range (work_area, start, end, translate) |
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
2421 RE_TRANSLATE_TYPE translate; |
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
2422 struct range_table_work_area *work_area; |
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
2423 re_wchar_t start, end; |
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
2424 { |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2425 re_wchar_t cmin, cmax; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2426 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2427 #ifdef emacs |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2428 /* For Latin-1 ranges, use set_image_of_range_1 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2429 to get proper handling of ranges that include letters and nonletters. |
47250
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2430 For a range that includes the whole of Latin-1, this is not necessary. |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2431 For other character sets, we don't bother to get this right. */ |
47250
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2432 if (RE_TRANSLATE_P (translate) && start < 04400 |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2433 && !(start < 04200 && end >= 04377)) |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2434 { |
47250
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2435 int newend; |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2436 int tem; |
47250
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2437 newend = end; |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2438 if (newend > 04377) |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2439 newend = 04377; |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2440 tem = set_image_of_range_1 (work_area, start, newend, translate); |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2441 if (tem > 0) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2442 return tem; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2443 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2444 start = 04400; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2445 if (end < 04400) |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2446 return -1; |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2447 } |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2448 #endif |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2449 |
47250
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2450 EXTEND_RANGE_TABLE (work_area, 2); |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2451 work_area->table[work_area->used++] = (start); |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2452 work_area->table[work_area->used++] = (end); |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2453 |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2454 cmin = -1, cmax = -1; |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2455 |
47008
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
2456 if (RE_TRANSLATE_P (translate)) |
47250
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2457 { |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2458 int ch; |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2459 |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2460 for (ch = start; ch <= end; ch++) |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2461 { |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2462 re_wchar_t c = TRANSLATE (ch); |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2463 if (! (start <= c && c <= end)) |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2464 { |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2465 if (cmin == -1) |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2466 cmin = c, cmax = c; |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2467 else |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2468 { |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2469 cmin = MIN (cmin, c); |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2470 cmax = MAX (cmax, c); |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2471 } |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2472 } |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2473 } |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2474 |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2475 if (cmin != -1) |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2476 { |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2477 EXTEND_RANGE_TABLE (work_area, 2); |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2478 work_area->table[work_area->used++] = (cmin); |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2479 work_area->table[work_area->used++] = (cmax); |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2480 } |
923aa802303b
(set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents:
47233
diff
changeset
|
2481 } |
47233
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2482 |
620fccf981d3
(set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
47008
diff
changeset
|
2483 return -1; |
47008
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
2484 } |
89483 | 2485 #endif /* 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
|
2486 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2487 #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
|
2488 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2489 /* 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
|
2490 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
|
2491 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
|
2492 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
|
2493 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
|
2494 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
|
2495 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2496 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
|
2497 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2498 /* 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
|
2499 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
|
2500 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
|
2501 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
|
2502 |
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
|
2503 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
|
2504 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
|
2505 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2506 /* 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
|
2507 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
|
2508 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2509 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
|
2510 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
|
2511 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
|
2512 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2513 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
|
2514 { |
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
|
2515 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
|
2516 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
|
2517 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
|
2518 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
|
2519 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2520 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
|
2521 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2522 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2523 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2524 #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
|
2525 |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2526 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
|
2527 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
|
2528 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
|
2529 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2530 /* `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
|
2531 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
|
2532 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2533 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
|
2534 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
|
2535 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2536 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
|
2537 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
|
2538 `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
|
2539 `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
|
2540 `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
|
2541 `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
|
2542 `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
|
2543 `not_bol' and `not_eol' are zero; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
2544 |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
2545 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
|
2546 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2547 /* 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
|
2548 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
|
2549 #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
|
2550 do { \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2551 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
|
2552 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
|
2553 } 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
|
2554 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2555 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2556 /* 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
|
2557 #define FREE_STACK_RETURN(value) \ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2558 do { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2559 FREE_RANGE_TABLE_WORK_AREA (range_table_work); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2560 free (compile_stack.stack); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2561 return value; \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2562 } 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
|
2563 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2564 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
|
2565 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
|
2566 re_char *pattern; |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
2567 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
|
2568 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
|
2569 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
|
2570 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
2571 /* We fetch characters from PATTERN here. */ |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
2572 register re_wchar_t c, c1; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
2573 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2574 /* 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
|
2575 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
|
2576 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2577 /* 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
|
2578 register unsigned char *b; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
2579 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2580 /* 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
|
2581 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
|
2582 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2583 /* 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
|
2584 #ifdef AIX |
dc8ce74d8633
(regex_compile): Declare p with non-const type on AIX.
Richard M. Stallman <rms@gnu.org>
parents:
22411
diff
changeset
|
2585 /* `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
|
2586 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
|
2587 #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
|
2588 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
|
2589 #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
|
2590 re_char *pend = pattern + size; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
2591 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2592 /* 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
|
2593 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
|
2594 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2595 /* 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
|
2596 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
|
2597 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
|
2598 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
|
2599 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
|
2600 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2601 /* 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
|
2602 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
|
2603 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
|
2604 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
|
2605 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2606 /* 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
|
2607 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
|
2608 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2609 /* 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
|
2610 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
|
2611 re_char *beg_interval; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
2612 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2613 /* Address of the place where a forward jump should go to the end of |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
2614 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
|
2615 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
|
2616 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
|
2617 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2618 /* Work area for range table of charset. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2619 struct range_table_work_area range_table_work; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2620 |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
2621 /* 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
|
2622 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
|
2623 |
89483 | 2624 /* If a target of matching can contain multibyte characters. */ |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
2625 const boolean target_multibyte = RE_TARGET_MULTIBYTE_P (bufp); |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
2626 |
58325
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2627 /* Nonzero if we have pushed down into a subpattern. */ |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2628 int in_subpattern = 0; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2629 |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2630 /* These hold the values of p, pattern, and pend from the main |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2631 pattern when we have pushed into a subpattern. */ |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2632 re_char *main_p; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2633 re_char *main_pattern; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2634 re_char *main_pend; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2635 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2636 #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
|
2637 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
|
2638 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
|
2639 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
|
2640 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2641 unsigned debug_count; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
2642 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2643 for (debug_count = 0; debug_count < size; debug_count++) |
18262 | 2644 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
|
2645 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
|
2646 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2647 #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
|
2648 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2649 /* 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
|
2650 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
|
2651 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
|
2652 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
|
2653 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2654 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
|
2655 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
|
2656 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2657 range_table_work.table = 0; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2658 range_table_work.allocated = 0; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2659 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2660 /* 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
|
2661 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
|
2662 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
|
2663 bufp->not_bol = bufp->not_eol = 0; |
73229
3501fcb2e68c
(regex_compile): Set the new `used_syntax' bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73056
diff
changeset
|
2664 bufp->used_syntax = 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
|
2665 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2666 /* 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
|
2667 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
|
2668 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
|
2669 bufp->used = 0; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
2670 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2671 /* 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
|
2672 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
|
2673 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
2674 #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
|
2675 /* 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
|
2676 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
|
2677 #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
|
2678 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2679 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
|
2680 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2681 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
|
2682 { /* If zero allocated, but buffer is non-null, try to realloc |
18262 | 2683 enough space. This loses if buffer's address is bogus, but |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
2684 that is the user's responsibility. */ |
18262 | 2685 RETALLOC (bufp->buffer, INIT_BUF_SIZE, unsigned char); |
2686 } | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2687 else |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
2688 { /* Caller did not allocate a buffer. Do it for them. */ |
18262 | 2689 bufp->buffer = TALLOC (INIT_BUF_SIZE, unsigned char); |
2690 } | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2691 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
|
2692 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2693 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
|
2694 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2695 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2696 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
|
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 /* Loop through the uncompiled pattern until we're at the end. */ |
58325
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2699 while (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
|
2700 { |
58325
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2701 if (p == pend) |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2702 { |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2703 /* If this is the end of an included regexp, |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2704 pop back to the main regexp and try again. */ |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2705 if (in_subpattern) |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2706 { |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2707 in_subpattern = 0; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2708 pattern = main_pattern; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2709 p = main_p; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2710 pend = main_pend; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2711 continue; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2712 } |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2713 /* If this is the end of the main regexp, we are done. */ |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2714 break; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2715 } |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2716 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2717 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
|
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 switch (c) |
18262 | 2720 { |
58325
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2721 case ' ': |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2722 { |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2723 re_char *p1 = p; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2724 |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2725 /* If there's no special whitespace regexp, treat |
58328 | 2726 spaces normally. And don't try to do this recursively. */ |
2727 if (!whitespace_regexp || in_subpattern) | |
58325
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2728 goto normal_char; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2729 |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2730 /* Peek past following spaces. */ |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2731 while (p1 != pend) |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2732 { |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2733 if (*p1 != ' ') |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2734 break; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2735 p1++; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2736 } |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2737 /* If the spaces are followed by a repetition op, |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2738 treat them normally. */ |
58780
7f1f68f88ae8
(regex_compile): Fix end-of-pattern case for space.
Richard M. Stallman <rms@gnu.org>
parents:
58328
diff
changeset
|
2739 if (p1 != pend |
7f1f68f88ae8
(regex_compile): Fix end-of-pattern case for space.
Richard M. Stallman <rms@gnu.org>
parents:
58328
diff
changeset
|
2740 && (*p1 == '*' || *p1 == '+' || *p1 == '?' |
58325
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2741 || (*p1 == '\\' && p1 + 1 != pend && p1[1] == '{'))) |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2742 goto normal_char; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2743 |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2744 /* Replace the spaces with the whitespace regexp. */ |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2745 in_subpattern = 1; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2746 main_p = p1; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2747 main_pend = pend; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2748 main_pattern = pattern; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2749 p = pattern = whitespace_regexp; |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2750 pend = p + strlen (p); |
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2751 break; |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
2752 } |
58325
d82983edcbe6
(regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
57665
diff
changeset
|
2753 |
18262 | 2754 case '^': |
2755 { | |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
2756 if ( /* If at start of pattern, it's an operator. */ |
18262 | 2757 p == pattern + 1 |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
2758 /* If context independent, it's an operator. */ |
18262 | 2759 || syntax & RE_CONTEXT_INDEP_ANCHORS |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
2760 /* Otherwise, depends on what's come before. */ |
18262 | 2761 || 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
|
2762 BUF_PUSH ((syntax & RE_NO_NEWLINE_ANCHOR) ? begbuf : begline); |
18262 | 2763 else |
2764 goto normal_char; | |
2765 } | |
2766 break; | |
2767 | |
2768 | |
2769 case '$': | |
2770 { | |
2771 if ( /* If at end of pattern, it's an operator. */ | |
2772 p == pend | |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
2773 /* If context independent, it's an operator. */ |
18262 | 2774 || syntax & RE_CONTEXT_INDEP_ANCHORS |
2775 /* Otherwise, depends on what's next. */ | |
2776 || 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
|
2777 BUF_PUSH ((syntax & RE_NO_NEWLINE_ANCHOR) ? endbuf : endline); |
18262 | 2778 else |
2779 goto normal_char; | |
2780 } | |
2781 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
|
2782 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2783 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2784 case '+': |
18262 | 2785 case '?': |
2786 if ((syntax & RE_BK_PLUS_QM) | |
2787 || (syntax & RE_LIMITED_OPS)) | |
2788 goto normal_char; | |
2789 handle_plus: | |
2790 case '*': | |
2791 /* If there is no previous pattern... */ | |
2792 if (!laststart) | |
2793 { | |
2794 if (syntax & RE_CONTEXT_INVALID_OPS) | |
2795 FREE_STACK_RETURN (REG_BADRPT); | |
2796 else if (!(syntax & RE_CONTEXT_INDEP_OPS)) | |
2797 goto normal_char; | |
2798 } | |
2799 | |
2800 { | |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
2801 /* 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
|
2802 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
|
2803 boolean greedy = 1; |
18262 | 2804 |
2805 /* If there is a sequence of repetition chars, collapse it | |
2806 down to just one (the right one). We can't combine | |
2807 interval operators with these because of, e.g., `a{2}*', | |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
2808 which should only match an even number of `a's. */ |
18262 | 2809 |
2810 for (;;) | |
2811 { | |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
2812 if ((syntax & RE_FRUGAL) |
26906
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2813 && 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
|
2814 greedy = 0; |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2815 else |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2816 { |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2817 zero_times_ok |= c != '+'; |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2818 many_times_ok |= c != '?'; |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2819 } |
18262 | 2820 |
2821 if (p == pend) | |
2822 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
|
2823 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
|
2824 || (!(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
|
2825 && (*p == '+' || *p == '?'))) |
18262 | 2826 ; |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2827 else if (syntax & RE_BK_PLUS_QM && *p == '\\') |
18262 | 2828 { |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2829 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
|
2830 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
|
2831 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
|
2832 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
|
2833 else |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2834 break; |
18262 | 2835 } |
2836 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
|
2837 break; |
18262 | 2838 /* 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
|
2839 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
|
2840 } |
18262 | 2841 |
2842 /* Star, etc. applied to an empty pattern is equivalent | |
2843 to an empty pattern. */ | |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2844 if (!laststart || laststart == b) |
18262 | 2845 break; |
2846 | |
2847 /* Now we know whether or not zero matches is allowed | |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
2848 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
|
2849 if (greedy) |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2850 { |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2851 if (many_times_ok) |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2852 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2853 boolean simple = skip_one_char (laststart) == b; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2854 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
|
2855 re_opcode_t ofj = |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
2856 /* Check if the loop can match the empty string. */ |
47368
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
2857 (simple || !analyse_first (laststart, b, NULL, 0)) |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
2858 ? on_failure_jump : on_failure_jump_loop; |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2859 assert (skip_one_char (laststart) <= b); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49276
diff
changeset
|
2860 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2861 if (!zero_times_ok && simple) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2862 { /* 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
|
2863 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
|
2864 into PP* if P is simple. */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2865 unsigned char *p1, *p2; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2866 startoffset = b - laststart; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2867 GET_BUFFER_SPACE (startoffset); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2868 p1 = b; p2 = laststart; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2869 while (p2 < p1) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2870 *b++ = *p2++; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2871 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
|
2872 } |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2873 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2874 GET_BUFFER_SPACE (6); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2875 if (!zero_times_ok) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2876 /* A + loop. */ |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
2877 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
|
2878 else |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2879 /* 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
|
2880 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
|
2881 that yet, we leave the decision up to |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2882 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
|
2883 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
|
2884 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
|
2885 b += 3; |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2886 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
|
2887 b += 3; |
18262 | 2888 } |
2889 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
|
2890 { |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2891 /* A simple ? pattern. */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2892 assert (zero_times_ok); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2893 GET_BUFFER_SPACE (3); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2894 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
|
2895 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
|
2896 } |
26906
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2897 } |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2898 else /* not greedy */ |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2899 { /* 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
|
2900 |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
2901 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
|
2902 if (many_times_ok) |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2903 { |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
2904 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
|
2905 |
47368
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
2906 /* The non-greedy multiple match looks like |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
2907 a repeat..until: we only need a conditional jump |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
2908 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
|
2909 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
|
2910 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
|
2911 : 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
|
2912 b += 3; |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2913 if (zero_times_ok) |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2914 { |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2915 /* 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
|
2916 To also match zero times, we need to first jump to |
47368
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
2917 the end of the loop (its conditional jump). */ |
26906
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2918 INSERT_JUMP (jump, laststart, b); |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2919 b += 3; |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2920 } |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2921 } |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2922 else |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2923 { |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2924 /* non-greedy a?? */ |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2925 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
|
2926 b += 3; |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2927 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
|
2928 b += 3; |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2929 } |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2930 } |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2931 } |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2932 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
|
2933 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
|
2934 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2935 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2936 case '.': |
18262 | 2937 laststart = b; |
2938 BUF_PUSH (anychar); | |
2939 break; | |
2940 | |
2941 | |
2942 case '[': | |
2943 { | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2944 CLEAR_RANGE_TABLE_WORK_USED (range_table_work); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2945 |
18262 | 2946 if (p == pend) FREE_STACK_RETURN (REG_EBRACK); |
2947 | |
2948 /* Ensure that we have enough space to push a charset: the | |
2949 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
|
2950 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
|
2951 |
18262 | 2952 laststart = b; |
2953 | |
2954 /* We test `*p == '^' twice, instead of using an if | |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
2955 statement, so we only need one BUF_PUSH. */ |
18262 | 2956 BUF_PUSH (*p == '^' ? charset_not : charset); |
2957 if (*p == '^') | |
2958 p++; | |
2959 | |
2960 /* Remember the first position in the bracket expression. */ | |
2961 p1 = p; | |
2962 | |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
2963 /* Push the number of bytes in the bitmap. */ |
18262 | 2964 BUF_PUSH ((1 << BYTEWIDTH) / BYTEWIDTH); |
2965 | |
2966 /* Clear the whole map. */ | |
2967 bzero (b, (1 << BYTEWIDTH) / BYTEWIDTH); | |
2968 | |
2969 /* charset_not matches newline according to a syntax bit. */ | |
2970 if ((re_opcode_t) b[-2] == charset_not | |
2971 && (syntax & RE_HAT_LISTS_NOT_NEWLINE)) | |
2972 SET_LIST_BIT ('\n'); | |
2973 | |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
2974 /* Read in characters and ranges, setting map bits. */ |
18262 | 2975 for (;;) |
2976 { | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2977 boolean escaped_char = false; |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
2978 const unsigned char *p2 = p; |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2979 re_wchar_t ch, c2; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2980 |
18262 | 2981 if (p == pend) FREE_STACK_RETURN (REG_EBRACK); |
2982 | |
47008
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
2983 /* Don't translate yet. The range TRANSLATE(X..Y) cannot |
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
2984 always be determined from TRANSLATE(X) and TRANSLATE(Y) |
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
2985 So the translation is done later in a loop. Example: |
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
2986 (let ((case-fold-search t)) (string-match "[A-_]" "A")) */ |
18262 | 2987 PATFETCH (c); |
2988 | |
2989 /* \ might escape characters inside [...] and [^...]. */ | |
2990 if ((syntax & RE_BACKSLASH_ESCAPE_IN_LISTS) && c == '\\') | |
2991 { | |
2992 if (p == pend) FREE_STACK_RETURN (REG_EESCAPE); | |
16010 | 2993 |
2994 PATFETCH (c); | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2995 escaped_char = true; |
18262 | 2996 } |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2997 else |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2998 { |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
2999 /* Could be the end of the bracket expression. If it's |
19184 | 3000 not (i.e., when the bracket expression is `[]' so |
3001 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
|
3002 if (c == ']' && p2 != p1) |
19184 | 3003 break; |
18262 | 3004 } |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3005 |
18262 | 3006 /* See if we're at the beginning of a possible character |
3007 class. */ | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3008 |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3009 if (!escaped_char && |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3010 syntax & RE_CHAR_CLASSES && c == '[' && *p == ':') |
19184 | 3011 { |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
3012 /* Leave room for the null. */ |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3013 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
|
3014 const unsigned char *class_beg; |
18262 | 3015 |
3016 PATFETCH (c); | |
3017 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
|
3018 class_beg = p; |
18262 | 3019 |
3020 /* If pattern is `[[:'. */ | |
3021 if (p == pend) FREE_STACK_RETURN (REG_EBRACK); | |
3022 | |
3023 for (;;) | |
3024 { | |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3025 PATFETCH (c); |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3026 if ((c == ':' && *p == ']') || p == pend) |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3027 break; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3028 if (c1 < CHAR_CLASS_MAX_LENGTH) |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3029 str[c1++] = c; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3030 else |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3031 /* 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
|
3032 str[0] = '\0'; |
18262 | 3033 } |
3034 str[c1] = '\0'; | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3035 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3036 /* If isn't a word bracketed by `[:' and `:]': |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3037 undo the ending character, the letters, and |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3038 leave the leading `:' and `[' (but set bits for |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3039 them). */ |
18262 | 3040 if (c == ':' && *p == ']') |
3041 { | |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3042 re_wctype_t cc; |
89483 | 3043 int limit; |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3044 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3045 cc = re_wctype (str); |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3046 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3047 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
|
3048 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
|
3049 |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3050 /* 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
|
3051 class. */ |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3052 PATFETCH (c); |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3053 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3054 if (p == pend) FREE_STACK_RETURN (REG_EBRACK); |
18262 | 3055 |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3056 #ifndef emacs |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3057 for (ch = 0; ch < (1 << BYTEWIDTH); ++ch) |
89483 | 3058 if (re_iswctype (btowc (ch), cc)) |
3059 { | |
3060 c = TRANSLATE (ch); | |
90727
a664c8170666
(regex_compile): Synch with HEAD.
Kenichi Handa <handa@m17n.org>
parents:
90718
diff
changeset
|
3061 if (c < (1 << BYTEWIDTH)) |
a664c8170666
(regex_compile): Synch with HEAD.
Kenichi Handa <handa@m17n.org>
parents:
90718
diff
changeset
|
3062 SET_LIST_BIT (c); |
89483 | 3063 } |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3064 #else /* emacs */ |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
3065 /* 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
|
3066 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
|
3067 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
|
3068 they can only match ASCII characters. We |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3069 don't need to handle them for multibyte. |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
3070 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
|
3071 |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3072 for (ch = 0; ch < 256; ++ch) |
18262 | 3073 { |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3074 c = RE_CHAR_TO_MULTIBYTE (ch); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3075 if (! CHAR_BYTE8_P (c) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3076 && re_iswctype (c, cc)) |
89483 | 3077 { |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3078 SET_LIST_BIT (ch); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3079 c1 = TRANSLATE (c); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3080 if (c1 == c) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3081 continue; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3082 if (ASCII_CHAR_P (c1)) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3083 SET_LIST_BIT (c1); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3084 else if ((c1 = RE_CHAR_TO_UNIBYTE (c1)) >= 0) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3085 SET_LIST_BIT (c1); |
89483 | 3086 } |
18262 | 3087 } |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3088 SET_RANGE_TABLE_WORK_AREA_BIT |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3089 (range_table_work, re_wctype_to_bit (cc)); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3090 #endif /* emacs */ |
73229
3501fcb2e68c
(regex_compile): Set the new `used_syntax' bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73056
diff
changeset
|
3091 /* In most cases the matching rule for char classes |
3501fcb2e68c
(regex_compile): Set the new `used_syntax' bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73056
diff
changeset
|
3092 only uses the syntax table for multibyte chars, |
3501fcb2e68c
(regex_compile): Set the new `used_syntax' bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73056
diff
changeset
|
3093 so that the content of the syntax-table it is not |
3501fcb2e68c
(regex_compile): Set the new `used_syntax' bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73056
diff
changeset
|
3094 hardcoded in the range_table. SPACE and WORD are |
3501fcb2e68c
(regex_compile): Set the new `used_syntax' bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73056
diff
changeset
|
3095 the two exceptions. */ |
3501fcb2e68c
(regex_compile): Set the new `used_syntax' bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73056
diff
changeset
|
3096 if ((1 << cc) & ((1 << RECC_SPACE) | (1 << RECC_WORD))) |
3501fcb2e68c
(regex_compile): Set the new `used_syntax' bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73056
diff
changeset
|
3097 bufp->used_syntax = 1; |
3501fcb2e68c
(regex_compile): Set the new `used_syntax' bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73056
diff
changeset
|
3098 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3099 /* Repeat the loop. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3100 continue; |
18262 | 3101 } |
3102 else | |
3103 { | |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3104 /* 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
|
3105 p = class_beg; |
18262 | 3106 SET_LIST_BIT ('['); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3107 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3108 /* Because the `:' may starts the range, we |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3109 can't simply set bit and repeat the loop. |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
3110 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
|
3111 c = ':'; |
18262 | 3112 } |
3113 } | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3114 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3115 if (p < pend && p[0] == '-' && p[1] != ']') |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3116 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3117 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3118 /* Discard the `-'. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3119 PATFETCH (c1); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3120 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3121 /* Fetch the character which ends the range. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3122 PATFETCH (c1); |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3123 #ifdef emacs |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3124 if (CHAR_BYTE8_P (c1) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3125 && ! ASCII_CHAR_P (c) && ! CHAR_BYTE8_P (c)) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3126 /* Treat the range from a multibyte character to |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3127 raw-byte character as empty. */ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3128 c = c1 + 1; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3129 #endif /* emacs */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3130 } |
18262 | 3131 else |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3132 /* Range from C to C. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3133 c1 = c; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3134 |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3135 if (c > c1) |
18262 | 3136 { |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3137 if (syntax & RE_NO_EMPTY_RANGES) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3138 FREE_STACK_RETURN (REG_ERANGEX); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3139 /* Else, repeat the loop. */ |
18262 | 3140 } |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
3141 else |
18262 | 3142 { |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3143 #ifndef emacs |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3144 /* Set the range into bitmap */ |
89483 | 3145 for (; c <= c1; c++) |
16010 | 3146 { |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3147 ch = TRANSLATE (c); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3148 if (ch < (1 << BYTEWIDTH)) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3149 SET_LIST_BIT (ch); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3150 } |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3151 #else /* emacs */ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3152 if (c < 128) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3153 { |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3154 ch = MIN (127, c1); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3155 SETUP_ASCII_RANGE (range_table_work, c, ch); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3156 c = ch + 1; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3157 if (CHAR_BYTE8_P (c1)) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3158 c = BYTE8_TO_CHAR (128); |
16010 | 3159 } |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3160 if (c <= c1) |
16010 | 3161 { |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3162 if (CHAR_BYTE8_P (c)) |
74323
ad2b5e25b8f0
(regex_compile): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
74277
diff
changeset
|
3163 { |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3164 c = CHAR_TO_BYTE8 (c); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3165 c1 = CHAR_TO_BYTE8 (c1); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3166 for (; c <= c1; c++) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3167 SET_LIST_BIT (c); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3168 } |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3169 else if (multibyte) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3170 { |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3171 SETUP_MULTIBYTE_RANGE (range_table_work, c, c1); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3172 } |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3173 else |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3174 { |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3175 SETUP_UNIBYTE_RANGE (range_table_work, c, c1); |
74323
ad2b5e25b8f0
(regex_compile): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
74277
diff
changeset
|
3176 } |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3177 } |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3178 #endif /* emacs */ |
18262 | 3179 } |
16010 | 3180 } |
3181 | |
18262 | 3182 /* Discard any (non)matching list bytes that are all 0 at the |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
3183 end of the map. Decrease the map-length byte too. */ |
18262 | 3184 while ((int) b[-1] > 0 && b[b[-1] - 1] == 0) |
3185 b[-1]--; | |
3186 b += b[-1]; | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3187 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
3188 /* 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
|
3189 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
|
3190 || RANGE_TABLE_WORK_BITS (range_table_work)) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3191 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3192 int i; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3193 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
|
3194 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3195 /* 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
|
3196 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
|
3197 each character. */ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
3198 GET_BUFFER_SPACE (4 + used * 3); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3199 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3200 /* Indicate the existence of range table. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3201 laststart[1] |= 0x80; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3202 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
3203 /* 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
|
3204 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
|
3205 *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
|
3206 *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
|
3207 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3208 STORE_NUMBER_AND_INCR (b, used / 2); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3209 for (i = 0; i < used; i++) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3210 STORE_CHARACTER_AND_INCR |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3211 (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
|
3212 } |
18262 | 3213 } |
3214 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
|
3215 |
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 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3217 case '(': |
18262 | 3218 if (syntax & RE_NO_BK_PARENS) |
3219 goto handle_open; | |
3220 else | |
3221 goto normal_char; | |
3222 | |
3223 | |
3224 case ')': | |
3225 if (syntax & RE_NO_BK_PARENS) | |
3226 goto handle_close; | |
3227 else | |
3228 goto normal_char; | |
3229 | |
3230 | |
3231 case '\n': | |
3232 if (syntax & RE_NEWLINE_ALT) | |
3233 goto handle_alt; | |
3234 else | |
3235 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
|
3236 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3237 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3238 case '|': |
18262 | 3239 if (syntax & RE_NO_BK_VBAR) |
3240 goto handle_alt; | |
3241 else | |
3242 goto normal_char; | |
3243 | |
3244 | |
3245 case '{': | |
3246 if (syntax & RE_INTERVALS && syntax & RE_NO_BK_BRACES) | |
3247 goto handle_interval; | |
3248 else | |
3249 goto normal_char; | |
3250 | |
3251 | |
3252 case '\\': | |
3253 if (p == pend) FREE_STACK_RETURN (REG_EESCAPE); | |
3254 | |
3255 /* Do not translate the character after the \, so that we can | |
3256 distinguish, e.g., \B from \b, even if we normally would | |
3257 translate, e.g., B to b. */ | |
47008
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
3258 PATFETCH (c); |
18262 | 3259 |
3260 switch (c) | |
3261 { | |
3262 case '(': | |
3263 if (syntax & RE_NO_BK_PARENS) | |
3264 goto normal_backslash; | |
3265 | |
3266 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
|
3267 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3268 int shy = 0; |
81329
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3269 regnum_t regnum = 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
|
3270 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
|
3271 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3272 /* 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
|
3273 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
|
3274 { |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3275 PATFETCH (c); /* Gobble up the '?'. */ |
81329
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3276 while (!shy) |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3277 { |
81329
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3278 PATFETCH (c); |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3279 switch (c) |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3280 { |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3281 case ':': shy = 1; break; |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3282 case '0': |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3283 /* An explicitly specified regnum must start |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3284 with non-0. */ |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3285 if (regnum == 0) |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3286 FREE_STACK_RETURN (REG_BADPAT); |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3287 case '1': case '2': case '3': case '4': |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3288 case '5': case '6': case '7': case '8': case '9': |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3289 regnum = 10*regnum + (c - '0'); break; |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3290 default: |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3291 /* Only (?:...) is supported right now. */ |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3292 FREE_STACK_RETURN (REG_BADPAT); |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3293 } |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3294 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3295 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3296 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3297 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3298 if (!shy) |
81329
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3299 regnum = ++bufp->re_nsub; |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3300 else if (regnum) |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3301 { /* It's actually not shy, but explicitly numbered. */ |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3302 shy = 0; |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3303 if (regnum > bufp->re_nsub) |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3304 bufp->re_nsub = regnum; |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3305 else if (regnum > bufp->re_nsub |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3306 /* Ideally, we'd want to check that the specified |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3307 group can't have matched (i.e. all subgroups |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3308 using the same regnum are in other branches of |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3309 OR patterns), but we don't currently keep track |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3310 of enough info to do that easily. */ |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3311 || group_in_compile_stack (compile_stack, regnum)) |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3312 FREE_STACK_RETURN (REG_BADPAT); |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3313 } |
81329
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3314 else |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3315 /* It's really shy. */ |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3316 regnum = - bufp->re_nsub; |
18262 | 3317 |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
3318 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
|
3319 { |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
3320 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
|
3321 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
|
3322 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
|
3323 |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
3324 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
|
3325 } |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
3326 |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
3327 /* These are the values to restore when we hit end of this |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
3328 group. They are all relative offsets, so that if the |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
3329 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
|
3330 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
|
3331 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
|
3332 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
|
3333 = 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
|
3334 COMPILE_STACK_TOP.laststart_offset = b - bufp->buffer; |
81329
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3335 COMPILE_STACK_TOP.regnum = regnum; |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3336 |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3337 /* Do not push a start_memory for groups beyond the last one |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3338 we can represent in the compiled pattern. */ |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3339 if (regnum <= MAX_REGNUM && regnum > 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
|
3340 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
|
3341 |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
3342 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
|
3343 |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
3344 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
|
3345 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
|
3346 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
|
3347 /* 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
|
3348 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
|
3349 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
|
3350 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
|
3351 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
|
3352 } |
18262 | 3353 |
3354 case ')': | |
3355 if (syntax & RE_NO_BK_PARENS) goto normal_backslash; | |
3356 | |
3357 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
|
3358 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3359 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
|
3360 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
|
3361 else |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3362 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
|
3363 } |
18262 | 3364 |
3365 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
|
3366 FIXUP_ALT_JUMP (); |
18262 | 3367 |
3368 /* See similar code for backslashed left paren above. */ | |
3369 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
|
3370 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3371 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
|
3372 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
|
3373 else |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3374 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
|
3375 } |
18262 | 3376 |
3377 /* Since we just checked for an empty stack above, this | |
3378 ``can't happen''. */ | |
3379 assert (compile_stack.avail != 0); | |
3380 { | |
3381 /* We don't just want to restore into `regnum', because | |
3382 later groups should continue to be numbered higher, | |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
3383 as in `(ab)c(de)' -- the second group is #2. */ |
81329
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3384 regnum_t regnum; |
18262 | 3385 |
3386 compile_stack.avail--; | |
3387 begalt = bufp->buffer + COMPILE_STACK_TOP.begalt_offset; | |
3388 fixup_alt_jump | |
3389 = COMPILE_STACK_TOP.fixup_alt_jump | |
3390 ? bufp->buffer + COMPILE_STACK_TOP.fixup_alt_jump - 1 | |
3391 : 0; | |
3392 laststart = bufp->buffer + COMPILE_STACK_TOP.laststart_offset; | |
81329
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3393 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
|
3394 /* 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
|
3395 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
|
3396 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
|
3397 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
|
3398 |
18262 | 3399 /* We're at the end of the group, so now we know how many |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
3400 groups were inside this one. */ |
81329
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3401 if (regnum <= MAX_REGNUM && regnum > 0) |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3402 BUF_PUSH_2 (stop_memory, regnum); |
18262 | 3403 } |
3404 break; | |
3405 | |
3406 | |
3407 case '|': /* `\|'. */ | |
3408 if (syntax & RE_LIMITED_OPS || syntax & RE_NO_BK_VBAR) | |
3409 goto normal_backslash; | |
3410 handle_alt: | |
3411 if (syntax & RE_LIMITED_OPS) | |
3412 goto normal_char; | |
3413 | |
3414 /* Insert before the previous alternative a jump which | |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
3415 jumps to this alternative if the former fails. */ |
18262 | 3416 GET_BUFFER_SPACE (3); |
3417 INSERT_JUMP (on_failure_jump, begalt, b + 6); | |
3418 pending_exact = 0; | |
3419 b += 3; | |
3420 | |
3421 /* The alternative before this one has a jump after it | |
3422 which gets executed if it gets matched. Adjust that | |
3423 jump so it will jump to this alternative's analogous | |
3424 jump (put in below, which in turn will jump to the next | |
3425 (if any) alternative's such jump, etc.). The last such | |
3426 jump jumps to the correct final destination. A picture: | |
3427 _____ _____ | |
3428 | | | | | |
3429 | v | v | |
3430 a | b | c | |
3431 | |
3432 If we are at `b', then fixup_alt_jump right now points to a | |
3433 three-byte space after `a'. We'll put in the jump, set | |
3434 fixup_alt_jump to right after `b', and leave behind three | |
3435 bytes which we'll fill in when we get to after `c'. */ | |
3436 | |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3437 FIXUP_ALT_JUMP (); |
18262 | 3438 |
3439 /* Mark and leave space for a jump after this alternative, | |
3440 to be filled in later either by next alternative or | |
3441 when know we're at the end of a series of alternatives. */ | |
3442 fixup_alt_jump = b; | |
3443 GET_BUFFER_SPACE (3); | |
3444 b += 3; | |
3445 | |
3446 laststart = 0; | |
3447 begalt = b; | |
3448 break; | |
3449 | |
3450 | |
3451 case '{': | |
3452 /* If \{ is a literal. */ | |
3453 if (!(syntax & RE_INTERVALS) | |
3454 /* If we're at `\{' and it's not the open-interval | |
3455 operator. */ | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3456 || (syntax & RE_NO_BK_BRACES)) |
18262 | 3457 goto normal_backslash; |
3458 | |
3459 handle_interval: | |
3460 { | |
3461 /* If got here, then the syntax allows intervals. */ | |
3462 | |
3463 /* 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
|
3464 int lower_bound = 0, upper_bound = -1; |
18262 | 3465 |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3466 beg_interval = p; |
18262 | 3467 |
3468 GET_UNSIGNED_NUMBER (lower_bound); | |
3469 | |
3470 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
|
3471 GET_UNSIGNED_NUMBER (upper_bound); |
18262 | 3472 else |
3473 /* Interval such as `{1}' => match exactly once. */ | |
3474 upper_bound = lower_bound; | |
3475 | |
3476 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
|
3477 || (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
|
3478 FREE_STACK_RETURN (REG_BADBR); |
18262 | 3479 |
3480 if (!(syntax & RE_NO_BK_BRACES)) | |
3481 { | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3482 if (c != '\\') |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3483 FREE_STACK_RETURN (REG_BADBR); |
58784
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
3484 if (p == pend) |
5f1c0193e984
(GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58780
diff
changeset
|
3485 FREE_STACK_RETURN (REG_EESCAPE); |
18262 | 3486 PATFETCH (c); |
3487 } | |
3488 | |
3489 if (c != '}') | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3490 FREE_STACK_RETURN (REG_BADBR); |
18262 | 3491 |
3492 /* We just parsed a valid interval. */ | |
3493 | |
3494 /* If it's invalid to have no preceding re. */ | |
3495 if (!laststart) | |
3496 { | |
3497 if (syntax & RE_CONTEXT_INVALID_OPS) | |
3498 FREE_STACK_RETURN (REG_BADRPT); | |
3499 else if (syntax & RE_CONTEXT_INDEP_OPS) | |
3500 laststart = b; | |
3501 else | |
3502 goto unfetch_interval; | |
3503 } | |
3504 | |
47368
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3505 if (upper_bound == 0) |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3506 /* If the upper bound is zero, just drop the sub pattern |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3507 altogether. */ |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3508 b = laststart; |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3509 else if (lower_bound == 1 && upper_bound == 1) |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3510 /* Just match it once: nothing to do here. */ |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3511 ; |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3512 |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3513 /* Otherwise, we have a nontrivial interval. When |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3514 we're all done, the pattern will look like: |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3515 set_number_at <jump count> <upper bound> |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3516 set_number_at <succeed_n count> <lower bound> |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3517 succeed_n <after jump addr> <succeed_n count> |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3518 <body of loop> |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3519 jump_n <succeed_n addr> <jump count> |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3520 (The upper bound and `jump_n' are omitted if |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3521 `upper_bound' is 1, though.) */ |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3522 else |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3523 { /* If the upper bound is > 1, we need to insert |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3524 more at the end of the loop. */ |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3525 unsigned int nbytes = (upper_bound < 0 ? 3 |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3526 : upper_bound > 1 ? 5 : 0); |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3527 unsigned int startoffset = 0; |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3528 |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3529 GET_BUFFER_SPACE (20); /* We might use less. */ |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3530 |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3531 if (lower_bound == 0) |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3532 { |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3533 /* A succeed_n that starts with 0 is really a |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3534 a simple on_failure_jump_loop. */ |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3535 INSERT_JUMP (on_failure_jump_loop, laststart, |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3536 b + 3 + nbytes); |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3537 b += 3; |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3538 } |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3539 else |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3540 { |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3541 /* Initialize lower bound of the `succeed_n', even |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3542 though it will be set during matching by its |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3543 attendant `set_number_at' (inserted next), |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3544 because `re_compile_fastmap' needs to know. |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3545 Jump to the `jump_n' we might insert below. */ |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3546 INSERT_JUMP2 (succeed_n, laststart, |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3547 b + 5 + nbytes, |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3548 lower_bound); |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3549 b += 5; |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3550 |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3551 /* Code to initialize the lower bound. Insert |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
3552 before the `succeed_n'. The `5' is the last two |
47368
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3553 bytes of this `set_number_at', plus 3 bytes of |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3554 the following `succeed_n'. */ |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3555 insert_op2 (set_number_at, laststart, 5, lower_bound, b); |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3556 b += 5; |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3557 startoffset += 5; |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3558 } |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3559 |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3560 if (upper_bound < 0) |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3561 { |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3562 /* A negative upper bound stands for infinity, |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3563 in which case it degenerates to a plain jump. */ |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3564 STORE_JUMP (jump, b, laststart + startoffset); |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3565 b += 3; |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3566 } |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3567 else if (upper_bound > 1) |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3568 { /* More than one repetition is allowed, so |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3569 append a backward jump to the `succeed_n' |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3570 that starts this interval. |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3571 |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3572 When we've reached this during matching, |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3573 we'll have matched the interval once, so |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3574 jump back only `upper_bound - 1' times. */ |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3575 STORE_JUMP2 (jump_n, b, laststart + startoffset, |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3576 upper_bound - 1); |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3577 b += 5; |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3578 |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3579 /* The location we want to set is the second |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3580 parameter of the `jump_n'; that is `b-2' as |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3581 an absolute address. `laststart' will be |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3582 the `set_number_at' we're about to insert; |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3583 `laststart+3' the number to set, the source |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3584 for the relative address. But we are |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3585 inserting into the middle of the pattern -- |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3586 so everything is getting moved up by 5. |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3587 Conclusion: (b - 2) - (laststart + 3) + 5, |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3588 i.e., b - laststart. |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3589 |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3590 We insert this at the beginning of the loop |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3591 so that if we fail during matching, we'll |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3592 reinitialize the bounds. */ |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3593 insert_op2 (set_number_at, laststart, b - laststart, |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3594 upper_bound - 1, b); |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3595 b += 5; |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3596 } |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
3597 } |
18262 | 3598 pending_exact = 0; |
3599 beg_interval = NULL; | |
3600 } | |
3601 break; | |
3602 | |
3603 unfetch_interval: | |
3604 /* If an invalid interval, match the characters as literals. */ | |
3605 assert (beg_interval); | |
3606 p = beg_interval; | |
3607 beg_interval = NULL; | |
3608 | |
3609 /* 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
|
3610 c = '{'; |
18262 | 3611 |
3612 if (!(syntax & RE_NO_BK_BRACES)) | |
3613 { | |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3614 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
|
3615 goto normal_backslash; |
18262 | 3616 } |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3617 else |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3618 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
|
3619 |
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 #ifdef emacs |
18262 | 3621 /* There is no way to specify the before_dot and after_dot |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
3622 operators. rms says this is ok. --karl */ |
18262 | 3623 case '=': |
3624 BUF_PUSH (at_dot); | |
3625 break; | |
3626 | |
3627 case 's': | |
3628 laststart = b; | |
3629 PATFETCH (c); | |
3630 BUF_PUSH_2 (syntaxspec, syntax_spec_code[c]); | |
3631 break; | |
3632 | |
3633 case 'S': | |
3634 laststart = b; | |
3635 PATFETCH (c); | |
3636 BUF_PUSH_2 (notsyntaxspec, syntax_spec_code[c]); | |
3637 break; | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3638 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3639 case 'c': |
16010 | 3640 laststart = b; |
47008
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
3641 PATFETCH (c); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3642 BUF_PUSH_2 (categoryspec, c); |
16010 | 3643 break; |
3644 | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3645 case 'C': |
16010 | 3646 laststart = b; |
47008
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
3647 PATFETCH (c); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3648 BUF_PUSH_2 (notcategoryspec, c); |
16010 | 3649 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
|
3650 #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
|
3651 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3652 |
18262 | 3653 case 'w': |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3654 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
|
3655 goto normal_char; |
18262 | 3656 laststart = b; |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3657 BUF_PUSH_2 (syntaxspec, Sword); |
18262 | 3658 break; |
3659 | |
3660 | |
3661 case 'W': | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3662 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
|
3663 goto normal_char; |
18262 | 3664 laststart = b; |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3665 BUF_PUSH_2 (notsyntaxspec, Sword); |
18262 | 3666 break; |
3667 | |
3668 | |
3669 case '<': | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3670 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
|
3671 goto normal_char; |
18262 | 3672 BUF_PUSH (wordbeg); |
3673 break; | |
3674 | |
3675 case '>': | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3676 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
|
3677 goto normal_char; |
18262 | 3678 BUF_PUSH (wordend); |
3679 break; | |
3680 | |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
3681 case '_': |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
3682 if (syntax & RE_NO_GNU_OPS) |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
3683 goto normal_char; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
3684 laststart = b; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
3685 PATFETCH (c); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
3686 if (c == '<') |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
3687 BUF_PUSH (symbeg); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
3688 else if (c == '>') |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
3689 BUF_PUSH (symend); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
3690 else |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
3691 FREE_STACK_RETURN (REG_BADPAT); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
3692 break; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
3693 |
18262 | 3694 case 'b': |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3695 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
|
3696 goto normal_char; |
18262 | 3697 BUF_PUSH (wordbound); |
3698 break; | |
3699 | |
3700 case 'B': | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3701 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
|
3702 goto normal_char; |
18262 | 3703 BUF_PUSH (notwordbound); |
3704 break; | |
3705 | |
3706 case '`': | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3707 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
|
3708 goto normal_char; |
18262 | 3709 BUF_PUSH (begbuf); |
3710 break; | |
3711 | |
3712 case '\'': | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3713 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
|
3714 goto normal_char; |
18262 | 3715 BUF_PUSH (endbuf); |
3716 break; | |
3717 | |
3718 case '1': case '2': case '3': case '4': case '5': | |
3719 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
|
3720 { |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3721 regnum_t reg; |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3722 |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3723 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
|
3724 goto normal_backslash; |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3725 |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3726 reg = c - '0'; |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3727 |
81329
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3728 if (reg > bufp->re_nsub || reg < 1 |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3729 /* Can't back reference to a subexp before its end. */ |
465e2d55267d
(regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75348
diff
changeset
|
3730 || group_in_compile_stack (compile_stack, reg)) |
33066
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3731 FREE_STACK_RETURN (REG_ESUBREG); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3732 |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3733 laststart = b; |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3734 BUF_PUSH_2 (duplicate, reg); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3735 } |
18262 | 3736 break; |
3737 | |
3738 | |
3739 case '+': | |
3740 case '?': | |
3741 if (syntax & RE_BK_PLUS_QM) | |
3742 goto handle_plus; | |
3743 else | |
3744 goto normal_backslash; | |
3745 | |
3746 default: | |
3747 normal_backslash: | |
3748 /* You might think it would be useful for \ to mean | |
3749 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
|
3750 it will never match anything. */ |
18262 | 3751 goto normal_char; |
3752 } | |
3753 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
|
3754 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3755 |
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 default: |
18262 | 3757 /* 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
|
3758 normal_char: |
47008
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
3759 /* If no exactn currently being built. */ |
18262 | 3760 if (!pending_exact |
3761 | |
3762 /* If last exactn not at current position. */ | |
3763 || pending_exact + *pending_exact + 1 != b | |
3764 | |
3765 /* 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
|
3766 || *pending_exact >= (1 << BYTEWIDTH) - MAX_MULTIBYTE_LENGTH |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3767 |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
3768 /* If followed by a repetition operator. */ |
21963
b717a61747c5
(regex_compile): When checking after exactn
Richard M. Stallman <rms@gnu.org>
parents:
21838
diff
changeset
|
3769 || (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
|
3770 || ((syntax & RE_BK_PLUS_QM) |
21963
b717a61747c5
(regex_compile): When checking after exactn
Richard M. Stallman <rms@gnu.org>
parents:
21838
diff
changeset
|
3771 ? 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
|
3772 : 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
|
3773 || ((syntax & RE_INTERVALS) |
18262 | 3774 && ((syntax & RE_NO_BK_BRACES) |
21963
b717a61747c5
(regex_compile): When checking after exactn
Richard M. Stallman <rms@gnu.org>
parents:
21838
diff
changeset
|
3775 ? p != pend && *p == '{' |
b717a61747c5
(regex_compile): When checking after exactn
Richard M. Stallman <rms@gnu.org>
parents:
21838
diff
changeset
|
3776 : 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
|
3777 { |
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 /* Start building a new exactn. */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3779 |
18262 | 3780 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
|
3781 |
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 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
|
3783 pending_exact = b - 1; |
18262 | 3784 } |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3785 |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3786 GET_BUFFER_SPACE (MAX_MULTIBYTE_LENGTH); |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3787 { |
30752
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3788 int len; |
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3789 |
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3790 if (multibyte) |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
3791 { |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3792 c = TRANSLATE (c); |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
3793 len = CHAR_STRING (c, b); |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
3794 b += len; |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
3795 } |
30752
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3796 else |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
3797 { |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3798 c1 = RE_CHAR_TO_MULTIBYTE (c); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3799 if (! CHAR_BYTE8_P (c1)) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3800 { |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3801 re_wchar_t c2 = TRANSLATE (c1); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3802 |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3803 if (c1 != c2 && (c1 = RE_CHAR_TO_UNIBYTE (c2)) >= 0) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3804 c = c1; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
3805 } |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
3806 *b++ = c; |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
3807 len = 1; |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
3808 } |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3809 (*pending_exact) += len; |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3810 } |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3811 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3812 break; |
18262 | 3813 } /* 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
|
3814 } /* 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
|
3815 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3816 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3817 /* Through the pattern now. */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3818 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3819 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
|
3820 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3821 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
|
3822 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
|
3823 |
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 /* 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
|
3825 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
|
3826 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
|
3827 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
|
3828 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3829 /* 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
|
3830 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
|
3831 |
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 #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
|
3833 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
|
3834 { |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3835 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
|
3836 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
|
3837 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
|
3838 } |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
3839 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
|
3840 #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
|
3841 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3842 #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
|
3843 /* 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
|
3844 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
|
3845 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
|
3846 { |
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 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
|
3848 |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
3849 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
|
3850 { |
21352
b9275822b6f5
(regex_compile) [!MATCH_MAY_ALLOCATE]: Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents:
21348
diff
changeset
|
3851 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
|
3852 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3853 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
|
3854 fail_stack.stack |
69039
f717c65a39d7
* regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
69038
diff
changeset
|
3855 = (fail_stack_elt_t *) malloc (fail_stack.size |
69073 | 3856 * 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
|
3857 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
|
3858 fail_stack.stack |
69039
f717c65a39d7
* regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
69038
diff
changeset
|
3859 = (fail_stack_elt_t *) realloc (fail_stack.stack, |
69073 | 3860 (fail_stack.size |
3861 * 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
|
3862 } |
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 |
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 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
|
3865 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3866 #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
|
3867 |
52680
3614833210ba
(regex_compile): Free the stack when returning from function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
3868 FREE_STACK_RETURN (REG_NOERROR); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3869 } /* 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
|
3870 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3871 /* 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
|
3872 |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
3873 /* 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
|
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 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
|
3876 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
|
3877 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
|
3878 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
|
3879 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
|
3880 { |
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 *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
|
3882 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
|
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 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3885 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3886 /* 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
|
3887 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3888 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
|
3889 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
|
3890 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
|
3891 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
|
3892 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
|
3893 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3894 *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
|
3895 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
|
3896 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
|
3897 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3898 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3899 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3900 /* 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
|
3901 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
|
3902 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3903 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
|
3904 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
|
3905 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
|
3906 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
|
3907 int arg; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3908 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
|
3909 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3910 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
|
3911 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
|
3912 |
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 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
|
3914 *--pto = *--pfrom; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3915 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3916 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
|
3917 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3918 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3919 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3920 /* 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
|
3921 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3922 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
|
3923 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
|
3924 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
|
3925 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
|
3926 int arg1, arg2; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3927 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
|
3928 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3929 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
|
3930 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
|
3931 |
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 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
|
3933 *--pto = *--pfrom; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3934 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3935 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
|
3936 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3937 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3938 |
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 /* 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
|
3940 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
|
3941 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
|
3942 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3943 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
|
3944 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
|
3945 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
|
3946 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
|
3947 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3948 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
|
3949 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
|
3950 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3951 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
|
3952 /* 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
|
3953 (*prev == '(' && (syntax & RE_NO_BK_PARENS || prev_prev_backslash)) |
18262 | 3954 /* After an alternative? */ |
29194
fe06affca294
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28662
diff
changeset
|
3955 || (*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
|
3956 /* After a shy subexpression? */ |
fe06affca294
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28662
diff
changeset
|
3957 || ((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
|
3958 && prev[-1] == '?' && prev[-2] == '(' |
fe06affca294
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28662
diff
changeset
|
3959 && (syntax & RE_NO_BK_PARENS |
fe06affca294
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28662
diff
changeset
|
3960 || (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
|
3961 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3962 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3963 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3964 /* 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
|
3965 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
|
3966 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3967 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
|
3968 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
|
3969 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
|
3970 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
|
3971 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3972 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
|
3973 boolean next_backslash = *next == '\\'; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3974 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
|
3975 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3976 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
|
3977 /* 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
|
3978 (syntax & RE_NO_BK_PARENS ? *next == ')' |
18262 | 3979 : 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
|
3980 /* 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
|
3981 || (syntax & RE_NO_BK_VBAR ? *next == '|' |
18262 | 3982 : 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
|
3983 } |
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 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3985 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3986 /* 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
|
3987 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
|
3988 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3989 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
|
3990 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
|
3991 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
|
3992 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
|
3993 { |
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 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
|
3995 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3996 for (this_element = compile_stack.avail - 1; |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3997 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
|
3998 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
|
3999 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
|
4000 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
|
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 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
|
4003 } |
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 |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4005 /* analyse_first. |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4006 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
|
4007 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
|
4008 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
|
4009 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
|
4010 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4011 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
|
4012 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
|
4013 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
|
4014 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4015 static int |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4016 analyse_first (p, pend, fastmap, multibyte) |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4017 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
|
4018 char *fastmap; |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4019 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
|
4020 { |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4021 int j, k; |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4022 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
|
4023 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4024 /* If all elements for base leading-codes in fastmap is set, this |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
4025 flag is set true. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4026 boolean match_any_multibyte_characters = false; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4027 |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4028 assert (p); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4029 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4030 /* 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
|
4031 - 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
|
4032 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
|
4033 - 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
|
4034 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
|
4035 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
|
4036 - 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
|
4037 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
|
4038 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
|
4039 (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
|
4040 worklist. |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4041 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
|
4042 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
|
4043 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
|
4044 |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4045 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
|
4046 { |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4047 /* `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
|
4048 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
|
4049 (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
|
4050 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
|
4051 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
|
4052 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
|
4053 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
|
4054 as used for the *? operator. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4055 re_char *p1 = p; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4056 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4057 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
|
4058 { |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4059 case succeed: |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4060 return 1; |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4061 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
|
4062 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4063 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
|
4064 /* 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
|
4065 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
|
4066 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
|
4067 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
|
4068 p++; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4069 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
|
4070 |
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 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4072 /* Following are the cases which match a character. These end |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
4073 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
|
4074 |
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 case exactn: |
30752
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
4076 if (fastmap) |
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
4077 { |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4078 /* If multibyte is nonzero, the first byte of each |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4079 character is an ASCII or a leading code. Otherwise, |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4080 each byte is a character. Thus, this works in both |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4081 cases. */ |
73056
2e2651f3d494
(analyse_first): For eight-bit-control chars, mark both the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72925
diff
changeset
|
4082 fastmap[p[1]] = 1; |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4083 if (! multibyte) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4084 { |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4085 /* For the case of matching this unibyte regex |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4086 against multibyte, we must set a leading code of |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4087 the corresponding multibyte character. */ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4088 int c = RE_CHAR_TO_MULTIBYTE (p[1]); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4089 |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4090 if (! CHAR_BYTE8_P (c)) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4091 fastmap[CHAR_LEADING_CODE (c)] = 1; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4092 } |
30752
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
4093 } |
11864
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 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
|
4095 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4096 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4097 case anychar: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4098 /* 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
|
4099 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
|
4100 if (!fastmap) break; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4101 return -1; |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4102 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4103 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4104 case charset_not: |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4105 if (!fastmap) break; |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4106 { |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4107 /* Chars beyond end of bitmap are possible matches. */ |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4108 for (j = CHARSET_BITMAP_SIZE (&p[-1]) * BYTEWIDTH; |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4109 j < (1 << BYTEWIDTH); j++) |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4110 fastmap[j] = 1; |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4111 } |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4112 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4113 /* Fallthrough */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4114 case charset: |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4115 if (!fastmap) break; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4116 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
|
4117 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
|
4118 j >= 0; j--) |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4119 if (!!(p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH))) ^ not) |
90610
82904c663deb
(analyse_first): Cancel the change for synching with
Kenichi Handa <handa@m17n.org>
parents:
90609
diff
changeset
|
4120 fastmap[j] = 1; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4121 |
73056
2e2651f3d494
(analyse_first): For eight-bit-control chars, mark both the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72925
diff
changeset
|
4122 #ifdef emacs |
90790
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4123 if (/* Any leading code can possibly start a character |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4124 which doesn't match the specified set of characters. */ |
90790
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4125 not |
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4126 || |
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4127 /* If we can match a character class, we can match any |
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4128 multibyte characters. */ |
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4129 (CHARSET_RANGE_TABLE_EXISTS_P (&p[-2]) |
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4130 && CHARSET_RANGE_TABLE_BITS (&p[-2]) != 0)) |
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4131 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4132 { |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4133 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
|
4134 { |
90790
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4135 for (j = MIN_MULTIBYTE_LEADING_CODE; |
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4136 j <= MAX_MULTIBYTE_LEADING_CODE; j++) |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4137 fastmap[j] = 1; |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4138 match_any_multibyte_characters = true; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4139 } |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4140 } |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4141 |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4142 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
|
4143 && match_any_multibyte_characters == false) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4144 { |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4145 /* Set fastmap[I] to 1 where I is a leading code of each |
88387
06da178fab0e
* regex.c: Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
40650
diff
changeset
|
4146 multibyte characer in the range table. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4147 int c, count; |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4148 unsigned char lc1, lc2; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4149 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4150 /* 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
|
4151 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
|
4152 p += CHARSET_BITMAP_SIZE (&p[-2]) + 2; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4153 |
25877
9a7d8b436a5d
1999-09-04 Richard Stallman <rms@gnu.org>
Dave Love <fx@gnu.org>
parents:
25440
diff
changeset
|
4154 /* 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
|
4155 EXTRACT_NUMBER_AND_INCR (count, p); |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4156 for (; count > 0; count--, p += 3) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4157 { |
88387
06da178fab0e
* regex.c: Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
40650
diff
changeset
|
4158 /* Extract the start and end of each range. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4159 EXTRACT_CHARACTER (c, p); |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4160 lc1 = CHAR_LEADING_CODE (c); |
88387
06da178fab0e
* regex.c: Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
40650
diff
changeset
|
4161 p += 3; |
06da178fab0e
* regex.c: Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
40650
diff
changeset
|
4162 EXTRACT_CHARACTER (c, p); |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4163 lc2 = CHAR_LEADING_CODE (c); |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4164 for (j = lc1; j <= lc2; j++) |
88387
06da178fab0e
* regex.c: Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
40650
diff
changeset
|
4165 fastmap[j] = 1; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4166 } |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4167 } |
90790
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4168 #endif |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4169 break; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4170 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4171 case syntaxspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4172 case notsyntaxspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4173 if (!fastmap) break; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4174 #ifndef emacs |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4175 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
|
4176 k = *p++; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4177 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
|
4178 if ((SYNTAX (j) == (enum syntaxcode) k) ^ not) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4179 fastmap[j] = 1; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4180 break; |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4181 #else /* emacs */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4182 /* 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
|
4183 aborting optimizations. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4184 return -1; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4185 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4186 case categoryspec: |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4187 case notcategoryspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4188 if (!fastmap) break; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4189 not = (re_opcode_t)p[-1] == notcategoryspec; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4190 k = *p++; |
90790
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4191 for (j = (1 << BYTEWIDTH); j >= 0; j--) |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4192 if ((CHAR_HAS_CATEGORY (j, k)) ^ not) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4193 fastmap[j] = 1; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4194 |
90790
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4195 /* Any leading code can possibly start a character which |
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4196 has or doesn't has the specified category. */ |
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4197 if (match_any_multibyte_characters == false) |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4198 { |
90790
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4199 for (j = MIN_MULTIBYTE_LEADING_CODE; |
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4200 j <= MAX_MULTIBYTE_LEADING_CODE; j++) |
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4201 fastmap[j] = 1; |
385c9b28d8a7
(analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents:
90766
diff
changeset
|
4202 match_any_multibyte_characters = true; |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4203 } |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4204 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
|
4205 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4206 /* All cases after this match the empty string. These end with |
18262 | 4207 `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
|
4208 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4209 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
|
4210 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
|
4211 case after_dot: |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4212 #endif /* !emacs */ |
18262 | 4213 case no_op: |
4214 case begline: | |
4215 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
|
4216 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
|
4217 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
|
4218 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
|
4219 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
|
4220 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
|
4221 case wordend: |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
4222 case symbeg: |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
4223 case symend: |
18262 | 4224 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
|
4225 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4226 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4227 case jump: |
18262 | 4228 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
|
4229 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
|
4230 /* 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
|
4231 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
|
4232 break; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4233 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
|
4234 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
|
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 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
|
4237 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
|
4238 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
|
4239 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
|
4240 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
|
4241 p++; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4242 break; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4243 default: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4244 continue; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4245 }; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4246 /* 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
|
4247 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
|
4248 /* Fallthrough */ |
18262 | 4249 |
4250 case on_failure_jump: | |
4251 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
|
4252 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
|
4253 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
|
4254 case on_failure_jump_smart: |
18262 | 4255 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
|
4256 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
|
4257 ; /* Backward jump to be ignored. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4258 else |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4259 { /* We have to look down both arms. |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4260 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
|
4261 stack usage when going through alternatives. */ |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4262 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
|
4263 if (r) return r; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4264 p += j; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4265 } |
18262 | 4266 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
|
4267 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4268 |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
4269 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
|
4270 /* 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
|
4271 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
|
4272 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
|
4273 /* 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
|
4274 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
|
4275 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
|
4276 continue; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49276
diff
changeset
|
4277 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4278 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
|
4279 /* 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
|
4280 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
|
4281 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
|
4282 /* 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
|
4283 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
|
4284 on_failure_jump. */ |
18262 | 4285 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
|
4286 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4287 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4288 case set_number_at: |
18262 | 4289 p += 4; |
4290 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
|
4291 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4292 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4293 case start_memory: |
18262 | 4294 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
|
4295 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
|
4296 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
|
4297 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4298 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4299 default: |
18262 | 4300 abort (); /* We have listed all the cases. */ |
4301 } /* 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
|
4302 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4303 /* Getting here means we have found the possible starting |
18262 | 4304 characters for one path of the pattern -- and that the empty |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
4305 string does not match. We need not follow this path further. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4306 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
|
4307 } /* 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
|
4308 |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4309 /* We reached the end without matching anything. */ |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4310 return 1; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4311 |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4312 } /* analyse_first */ |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4313 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4314 /* 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
|
4315 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
|
4316 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
|
4317 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
|
4318 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4319 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
|
4320 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
|
4321 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
|
4322 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4323 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
|
4324 area as BUFP->fastmap. |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4325 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4326 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
|
4327 the pattern buffer. |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4328 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4329 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
|
4330 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4331 int |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4332 re_compile_fastmap (bufp) |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4333 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
|
4334 { |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4335 char *fastmap = bufp->fastmap; |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4336 int analysis; |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4337 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4338 assert (fastmap && bufp->buffer); |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4339 |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
4340 bzero (fastmap, 1 << BYTEWIDTH); /* Assume nothing's valid. */ |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4341 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
|
4342 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
4343 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
|
4344 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
|
4345 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
|
4346 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
|
4347 } /* 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
|
4348 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4349 /* 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
|
4350 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
|
4351 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
|
4352 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
|
4353 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
|
4354 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4355 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
|
4356 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
|
4357 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4358 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
|
4359 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
|
4360 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
|
4361 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4362 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
|
4363 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
|
4364 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
|
4365 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
|
4366 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
|
4367 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
|
4368 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4369 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
|
4370 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4371 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
|
4372 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
|
4373 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
|
4374 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
|
4375 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4376 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
|
4377 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4378 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
|
4379 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
|
4380 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
|
4381 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4382 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
4383 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
|
4384 |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
4385 /* 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
|
4386 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4387 /* 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
|
4388 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
|
4389 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4390 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
|
4391 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
|
4392 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
|
4393 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
|
4394 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
|
4395 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
|
4396 { |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4397 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
|
4398 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
|
4399 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
4400 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
|
4401 |
49276
f71131f142ff
(GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents:
48424
diff
changeset
|
4402 /* Head address of virtual concatenation of string. */ |
f71131f142ff
(GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents:
48424
diff
changeset
|
4403 #define HEAD_ADDR_VSTRING(P) \ |
f71131f142ff
(GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents:
48424
diff
changeset
|
4404 (((P) >= size1 ? string2 : string1)) |
f71131f142ff
(GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents:
48424
diff
changeset
|
4405 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4406 /* End address of virtual concatenation of string. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4407 #define STOP_ADDR_VSTRING(P) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4408 (((P) >= size1 ? string2 + size2 : string1 + size1)) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4409 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4410 /* 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
|
4411 #define POS_ADDR_VSTRING(POS) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4412 (((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
|
4413 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4414 /* 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
|
4415 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
|
4416 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
|
4417 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4418 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
|
4419 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4420 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
|
4421 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
|
4422 RANGE. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4423 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4424 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
|
4425 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
|
4426 subexpressions. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4427 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4428 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
|
4429 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
|
4430 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4431 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
|
4432 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
|
4433 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
|
4434 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4435 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
|
4436 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
|
4437 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
|
4438 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
|
4439 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
|
4440 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
|
4441 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
|
4442 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
|
4443 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
|
4444 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4445 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
|
4446 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
|
4447 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
|
4448 register char *fastmap = bufp->fastmap; |
13250
52e053f46f76
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard M. Stallman <rms@gnu.org>
parents:
13100
diff
changeset
|
4449 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
|
4450 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
|
4451 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
|
4452 boolean anchored_start; |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4453 /* Nonzero if we are searching multibyte string. */ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4454 const boolean multibyte = RE_TARGET_MULTIBYTE_P (bufp); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4455 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4456 /* 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
|
4457 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
|
4458 return -1; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4459 |
11864
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 /* 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
|
4461 the virtual concatenation of STRING1 and STRING2. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4462 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
|
4463 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
|
4464 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
|
4465 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
|
4466 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
|
4467 |
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 /* 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
|
4469 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
|
4470 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
|
4471 { |
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 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
|
4473 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
|
4474 else |
21760
f97c01dfd603
(re_search_2): Fix handling of at_dot.
Richard M. Stallman <rms@gnu.org>
parents:
21562
diff
changeset
|
4475 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
|
4476 } |
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 |
12983
ed39ba26313b
(re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents:
12931
diff
changeset
|
4478 #ifdef emacs |
ed39ba26313b
(re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents:
12931
diff
changeset
|
4479 /* 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
|
4480 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
|
4481 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
|
4482 { |
21760
f97c01dfd603
(re_search_2): Fix handling of at_dot.
Richard M. Stallman <rms@gnu.org>
parents:
21562
diff
changeset
|
4483 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
|
4484 if (range < 0) |
12983
ed39ba26313b
(re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents:
12931
diff
changeset
|
4485 return -1; |
ed39ba26313b
(re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents:
12931
diff
changeset
|
4486 } |
ed39ba26313b
(re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents:
12931
diff
changeset
|
4487 #endif /* emacs */ |
ed39ba26313b
(re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents:
12931
diff
changeset
|
4488 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4489 /* 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
|
4490 if (fastmap && !bufp->fastmap_accurate) |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4491 re_compile_fastmap (bufp); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4492 |
16009
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
4493 /* 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
|
4494 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
|
4495 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4496 #ifdef emacs |
21482
9898a4994a12
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
21404
diff
changeset
|
4497 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
|
4498 { |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4499 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
|
4500 |
9898a4994a12
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
21404
diff
changeset
|
4501 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
|
4502 } |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4503 #endif |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4504 |
11864
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 /* 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
|
4506 for (;;) |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4507 { |
16009
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
4508 /* If the pattern is anchored, |
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
4509 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
|
4510 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
|
4511 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
|
4512 if (anchored_start && startpos > 0) |
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
4513 { |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
4514 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
|
4515 : string2[startpos - size1 - 1]) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
4516 == '\n')) |
16009
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
4517 goto advance; |
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
4518 } |
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
4519 |
11864
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 /* If a fastmap is supplied, skip quickly over characters that |
18262 | 4521 cannot be the start of a match. If the pattern can match the |
4522 null string, however, we don't need to skip characters; we want | |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
4523 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
|
4524 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
|
4525 { |
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 register re_char *d; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4527 register re_wchar_t buf_ch; |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4528 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4529 d = POS_ADDR_VSTRING (startpos); |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4530 |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
4531 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
|
4532 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4533 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
|
4534 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
|
4535 |
18262 | 4536 if (startpos < size1 && startpos + range >= size1) |
4537 lim = range - (size1 - startpos); | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4538 |
18262 | 4539 /* Written out as an if-else to avoid testing `translate' |
4540 inside the loop. */ | |
21838
1d93b782b983
(re_search_2): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
21760
diff
changeset
|
4541 if (RE_TRANSLATE_P (translate)) |
1d93b782b983
(re_search_2): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
21760
diff
changeset
|
4542 { |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4543 if (multibyte) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4544 while (range > lim) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4545 { |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4546 int buf_charlen; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4547 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4548 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
|
4549 buf_charlen); |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4550 buf_ch = RE_TRANSLATE (translate, buf_ch); |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4551 if (fastmap[CHAR_LEADING_CODE (buf_ch)]) |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4552 break; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4553 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4554 range -= buf_charlen; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4555 d += buf_charlen; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4556 } |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4557 else |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4558 while (range > lim) |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4559 { |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4560 register re_wchar_t ch, translated; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4561 |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4562 buf_ch = *d; |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4563 ch = RE_CHAR_TO_MULTIBYTE (buf_ch); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4564 translated = RE_TRANSLATE (translate, ch); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4565 if (translated != ch |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4566 && (ch = RE_CHAR_TO_UNIBYTE (translated)) >= 0) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4567 buf_ch = ch; |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4568 if (fastmap[buf_ch]) |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4569 break; |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4570 d++; |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4571 range--; |
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
4572 } |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4573 } |
11864
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 else |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4575 { |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4576 if (multibyte) |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4577 while (range > lim) |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4578 { |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4579 int buf_charlen; |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4580 |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4581 buf_ch = STRING_CHAR_AND_LENGTH (d, range - lim, |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4582 buf_charlen); |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4583 if (fastmap[CHAR_LEADING_CODE (buf_ch)]) |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4584 break; |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4585 range -= buf_charlen; |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4586 d += buf_charlen; |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4587 } |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4588 else |
73056
2e2651f3d494
(analyse_first): For eight-bit-control chars, mark both the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72925
diff
changeset
|
4589 while (range > lim && !fastmap[*d]) |
2e2651f3d494
(analyse_first): For eight-bit-control chars, mark both the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72925
diff
changeset
|
4590 { |
2e2651f3d494
(analyse_first): For eight-bit-control chars, mark both the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72925
diff
changeset
|
4591 d++; |
2e2651f3d494
(analyse_first): For eight-bit-control chars, mark both the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72925
diff
changeset
|
4592 range--; |
2e2651f3d494
(analyse_first): For eight-bit-control chars, mark both the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72925
diff
changeset
|
4593 } |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4594 } |
11864
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 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
|
4596 } |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
4597 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
|
4598 { |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
4599 int room = (startpos >= size1 |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
4600 ? size2 + size1 - startpos |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
4601 : size1 - startpos); |
89176
729d852f7419
(re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
89116
diff
changeset
|
4602 if (multibyte) |
729d852f7419
(re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
89116
diff
changeset
|
4603 { |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4604 buf_ch = STRING_CHAR (d, room); |
89176
729d852f7419
(re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
89116
diff
changeset
|
4605 buf_ch = TRANSLATE (buf_ch); |
729d852f7419
(re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
89116
diff
changeset
|
4606 if (! fastmap[CHAR_LEADING_CODE (buf_ch)]) |
729d852f7419
(re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
89116
diff
changeset
|
4607 goto advance; |
729d852f7419
(re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
89116
diff
changeset
|
4608 } |
729d852f7419
(re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
89116
diff
changeset
|
4609 else |
729d852f7419
(re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
89116
diff
changeset
|
4610 { |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4611 register re_wchar_t ch, translated; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4612 |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4613 buf_ch = *d; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4614 ch = RE_CHAR_TO_MULTIBYTE (buf_ch); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4615 translated = TRANSLATE (ch); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4616 if (translated != ch |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4617 && (ch = RE_CHAR_TO_UNIBYTE (translated)) >= 0) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4618 buf_ch = ch; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4619 if (! fastmap[TRANSLATE (buf_ch)]) |
89176
729d852f7419
(re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
89116
diff
changeset
|
4620 goto advance; |
729d852f7419
(re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
89116
diff
changeset
|
4621 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4622 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4623 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4624 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4625 /* 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
|
4626 if (range >= 0 && startpos == total_size && fastmap |
18262 | 4627 && !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
|
4628 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
|
4629 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4630 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
|
4631 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
|
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 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
|
4634 return startpos; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4635 |
11864
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 (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
|
4637 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
|
4638 |
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 advance: |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4640 if (!range) |
18262 | 4641 break; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4642 else if (range > 0) |
18262 | 4643 { |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4644 /* Update STARTPOS to the next character boundary. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4645 if (multibyte) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4646 { |
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
|
4647 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
|
4648 re_char *pend = STOP_ADDR_VSTRING (startpos); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4649 int len = MULTIBYTE_FORM_LENGTH (p, pend - p); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4650 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4651 range -= len; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4652 if (range < 0) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4653 break; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4654 startpos += len; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4655 } |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4656 else |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4657 { |
18532
488df9d19f5e
(re_search_2): Cast result of POS_ADDR_VSTRING.
Richard M. Stallman <rms@gnu.org>
parents:
18263
diff
changeset
|
4658 range--; |
488df9d19f5e
(re_search_2): Cast result of POS_ADDR_VSTRING.
Richard M. Stallman <rms@gnu.org>
parents:
18263
diff
changeset
|
4659 startpos++; |
488df9d19f5e
(re_search_2): Cast result of POS_ADDR_VSTRING.
Richard M. Stallman <rms@gnu.org>
parents:
18263
diff
changeset
|
4660 } |
16010 | 4661 } |
11864
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 else |
18262 | 4663 { |
4664 range++; | |
4665 startpos--; | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4666 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4667 /* Update STARTPOS to the previous character boundary. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4668 if (multibyte) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4669 { |
49276
f71131f142ff
(GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents:
48424
diff
changeset
|
4670 re_char *p = POS_ADDR_VSTRING (startpos) + 1; |
f71131f142ff
(GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents:
48424
diff
changeset
|
4671 re_char *p0 = p; |
f71131f142ff
(GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents:
48424
diff
changeset
|
4672 re_char *phead = HEAD_ADDR_VSTRING (startpos); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4673 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4674 /* Find the head of multibyte form. */ |
49276
f71131f142ff
(GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents:
48424
diff
changeset
|
4675 PREV_CHAR_BOUNDARY (p, phead); |
f71131f142ff
(GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents:
48424
diff
changeset
|
4676 range += p0 - 1 - p; |
f71131f142ff
(GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents:
48424
diff
changeset
|
4677 if (range > 0) |
f71131f142ff
(GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents:
48424
diff
changeset
|
4678 break; |
f71131f142ff
(GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents:
48424
diff
changeset
|
4679 |
f71131f142ff
(GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents:
48424
diff
changeset
|
4680 startpos -= p0 - 1 - p; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4681 } |
18262 | 4682 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4683 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4684 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
|
4685 } /* re_search_2 */ |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
4686 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
|
4687 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4688 /* 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
|
4689 |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
4690 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
|
4691 register int len, |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
4692 RE_TRANSLATE_TYPE translate, |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
4693 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
|
4694 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4695 /* 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
|
4696 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
|
4697 #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
|
4698 (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
|
4699 ? ((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
|
4700 : ((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
|
4701 |
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 /* 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
|
4703 string2 if necessary. |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4704 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
|
4705 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
|
4706 #define PREFETCH() \ |
18262 | 4707 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
|
4708 { \ |
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 /* End of string2 => fail. */ \ |
18262 | 4710 if (dend == end_match_2) \ |
4711 goto fail; \ | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
4712 /* End of string1 => advance to string2. */ \ |
18262 | 4713 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
|
4714 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
|
4715 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4716 |
29296
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4717 /* 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
|
4718 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
|
4719 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
|
4720 outside of the LIMITs (i.e past `stop'). */ |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4721 #define PREFETCH_NOLIMIT() \ |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4722 if (d == end1) \ |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4723 { \ |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4724 d = string2; \ |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4725 dend = end_match_2; \ |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4726 } \ |
11864
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 /* Test if at very beginning or at very end of the virtual concatenation |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
4729 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
|
4730 #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
|
4731 #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
|
4732 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4733 |
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 /* 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
|
4735 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
|
4736 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
|
4737 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
|
4738 #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
|
4739 (SYNTAX ((d) == end1 ? *string2 \ |
18262 | 4740 : (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
|
4741 == 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
|
4742 |
13722
e2669b8a46e2
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
13565
diff
changeset
|
4743 /* 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
|
4744 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4745 /* 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
|
4746 AT_WORD_BOUNDARY anymore to support multibyte form. |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4747 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4748 The DEC Alpha C compiler 3.x generates incorrect code for the |
18262 | 4749 test WORDCHAR_P (d - 1) != WORDCHAR_P (d) in the expansion of |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
4750 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
|
4751 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
|
4752 |
13722
e2669b8a46e2
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
13565
diff
changeset
|
4753 #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
|
4754 /* 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
|
4755 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
|
4756 #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
|
4757 (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
|
4758 || WORDCHAR_P (d - 1) != WORDCHAR_P (d)) |
13722
e2669b8a46e2
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
13565
diff
changeset
|
4759 #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
|
4760 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4761 /* 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
|
4762 #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
|
4763 # 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
|
4764 # 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
|
4765 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
|
4766 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
|
4767 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
|
4768 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
|
4769 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
|
4770 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
|
4771 } 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
|
4772 #else |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
4773 # 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
|
4774 #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
|
4775 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4776 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4777 /* 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
|
4778 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4779 /* 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
|
4780 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
|
4781 static re_char * |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4782 skip_one_char (p) |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4783 re_char *p; |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4784 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4785 switch (SWITCH_ENUM_CAST (*p++)) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4786 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4787 case anychar: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4788 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49276
diff
changeset
|
4789 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4790 case exactn: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4791 p += *p + 1; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4792 break; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4793 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4794 case charset_not: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4795 case charset: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4796 if (CHARSET_RANGE_TABLE_EXISTS_P (p - 1)) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4797 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4798 int mcnt; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4799 p = CHARSET_RANGE_TABLE (p - 1); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4800 EXTRACT_NUMBER_AND_INCR (mcnt, p); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4801 p = CHARSET_RANGE_TABLE_END (p, mcnt); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4802 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4803 else |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4804 p += 1 + CHARSET_BITMAP_SIZE (p - 1); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4805 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49276
diff
changeset
|
4806 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4807 case syntaxspec: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4808 case notsyntaxspec: |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4809 #ifdef emacs |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4810 case categoryspec: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4811 case notcategoryspec: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4812 #endif /* emacs */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4813 p++; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4814 break; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4815 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4816 default: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4817 p = NULL; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4818 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4819 return p; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4820 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4821 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4822 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4823 /* Jump over non-matching operations. */ |
52838
246c94760bee
(MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents:
52680
diff
changeset
|
4824 static re_char * |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4825 skip_noops (p, pend) |
52838
246c94760bee
(MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents:
52680
diff
changeset
|
4826 re_char *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
|
4827 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4828 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
|
4829 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
|
4830 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4831 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
|
4832 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4833 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
|
4834 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
|
4835 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
|
4836 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
|
4837 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
|
4838 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
|
4839 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
|
4840 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
|
4841 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
|
4842 break; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4843 default: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4844 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
|
4845 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4846 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4847 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
|
4848 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
|
4849 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4850 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4851 /* 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
|
4852 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
|
4853 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
|
4854 struct re_pattern_buffer *bufp; |
52838
246c94760bee
(MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents:
52680
diff
changeset
|
4855 re_char *p1, *p2; |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4856 { |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4857 re_opcode_t op2; |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
4858 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
|
4859 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
|
4860 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4861 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
|
4862 && 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
|
4863 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4864 /* 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
|
4865 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
|
4866 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
|
4867 match at least one of that. */ |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4868 p2 = skip_noops (p2, pend); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4869 /* 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
|
4870 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
|
4871 /* p1 = skip_noops (p1, pend); */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4872 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4873 assert (p1 >= bufp->buffer && p1 < pend |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4874 && p2 >= bufp->buffer && p2 <= pend); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4875 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4876 op2 = p2 == pend ? succeed : *p2; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4877 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4878 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
|
4879 { |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4880 case succeed: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4881 case endbuf: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4882 /* 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
|
4883 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
|
4884 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4885 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
|
4886 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
|
4887 } |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4888 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49276
diff
changeset
|
4889 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4890 case endline: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4891 case exactn: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4892 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4893 register re_wchar_t c |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4894 = (re_opcode_t) *p2 == endline ? '\n' |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4895 : RE_STRING_CHAR (p2 + 2, pend - p2 - 2, multibyte); |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4896 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4897 if ((re_opcode_t) *p1 == exactn) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4898 { |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
4899 if (c != RE_STRING_CHAR (p1 + 2, pend - p1 - 2, multibyte)) |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4900 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4901 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
|
4902 return 1; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4903 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4904 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4905 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4906 else if ((re_opcode_t) *p1 == charset |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4907 || (re_opcode_t) *p1 == charset_not) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4908 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4909 int not = (re_opcode_t) *p1 == charset_not; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4910 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4911 /* 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
|
4912 at `p1'. */ |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4913 if (! multibyte || IS_REAL_ASCII (c)) |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4914 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4915 if (c < CHARSET_BITMAP_SIZE (p1) * BYTEWIDTH |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4916 && p1[2 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH))) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4917 not = !not; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4918 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4919 else if (CHARSET_RANGE_TABLE_EXISTS_P (p1)) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4920 CHARSET_LOOKUP_RANGE_TABLE (not, c, p1); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4921 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4922 /* `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
|
4923 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
|
4924 if (!not) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4925 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4926 DEBUG_PRINT1 (" No match => fast loop.\n"); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4927 return 1; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4928 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4929 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4930 else if ((re_opcode_t) *p1 == anychar |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4931 && c == '\n') |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4932 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4933 DEBUG_PRINT1 (" . != \\n => fast loop.\n"); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4934 return 1; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4935 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4936 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4937 break; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4938 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4939 case charset: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4940 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4941 if ((re_opcode_t) *p1 == exactn) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4942 /* Reuse the code above. */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4943 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
|
4944 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4945 /* 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
|
4946 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
|
4947 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
|
4948 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
|
4949 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4950 /* 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
|
4951 So, for the size of bitmap in P2, `p2[1]' is |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
4952 enough. But P1 may have range table, so 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
|
4953 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
|
4954 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
|
4955 |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4956 In a multibyte case, we know that all the character |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4957 listed in P2 is ASCII. In a unibyte case, P1 has only a |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4958 bitmap table. So, in both cases, it is enough to test |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
4959 only the bitmap table of 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
|
4960 |
35525
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4961 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
|
4962 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4963 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
|
4964 /* 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
|
4965 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
|
4966 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
|
4967 (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
|
4968 && 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
|
4969 idx++) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4970 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
|
4971 break; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4972 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4973 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
|
4974 || 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
|
4975 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4976 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
|
4977 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
|
4978 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4979 } |
35525
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4980 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
|
4981 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4982 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
|
4983 /* We win if the charset_not inside the loop lists |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
4984 every character listed in the charset after. */ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4985 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
|
4986 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
|
4987 || (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
|
4988 && ((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
|
4989 break; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4990 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4991 if (idx == p2[1]) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4992 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4993 DEBUG_PRINT1 (" No match => fast loop.\n"); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4994 return 1; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4995 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4996 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4997 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4998 } |
35533
6bd789b0ccc3
(mutually_exclusive_p): Add missing `break' at the end of `charset' processing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35525
diff
changeset
|
4999 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49276
diff
changeset
|
5000 |
35525
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
5001 case charset_not: |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
5002 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
|
5003 { |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
5004 case exactn: |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
5005 case charset: |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
5006 /* Reuse the code above. */ |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
5007 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
|
5008 case charset_not: |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
5009 /* 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
|
5010 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
|
5011 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
|
5012 fact, is virtually impossible in multibyte buffers. */ |
47008
c299d527a088
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44145
diff
changeset
|
5013 break; |
35525
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
5014 } |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
5015 break; |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
5016 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5017 case wordend: |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
5018 return ((re_opcode_t) *p1 == syntaxspec && p1[1] == Sword); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
5019 case symend: |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5020 return ((re_opcode_t) *p1 == syntaxspec |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
5021 && (p1[1] == Ssymbol || p1[1] == Sword)); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
5022 case notsyntaxspec: |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
5023 return ((re_opcode_t) *p1 == syntaxspec && p1[1] == p2[1]); |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5024 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5025 case wordbeg: |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
5026 return ((re_opcode_t) *p1 == notsyntaxspec && p1[1] == Sword); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
5027 case symbeg: |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5028 return ((re_opcode_t) *p1 == notsyntaxspec |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
5029 && (p1[1] == Ssymbol || p1[1] == Sword)); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
5030 case syntaxspec: |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
5031 return ((re_opcode_t) *p1 == notsyntaxspec && p1[1] == p2[1]); |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5032 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5033 case wordbound: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5034 return (((re_opcode_t) *p1 == notsyntaxspec |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5035 || (re_opcode_t) *p1 == syntaxspec) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5036 && p1[1] == Sword); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5037 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5038 #ifdef emacs |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5039 case categoryspec: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5040 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
|
5041 case notcategoryspec: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5042 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
|
5043 #endif /* emacs */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5044 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5045 default: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5046 ; |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5047 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5048 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5049 /* 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
|
5050 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
|
5051 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5052 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5053 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5054 /* 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
|
5055 |
18262 | 5056 #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
|
5057 /* 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
|
5058 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5059 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
|
5060 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
|
5061 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
|
5062 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
|
5063 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
|
5064 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
|
5065 { |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5066 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
|
5067 pos, 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
|
5068 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
|
5069 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5070 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
|
5071 #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
|
5072 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5073 #ifdef emacs |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5074 /* In Emacs, this is the string or buffer in which we |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5075 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
|
5076 Lisp_Object re_match_object; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5077 #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
|
5078 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5079 /* 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
|
5080 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
|
5081 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
|
5082 matching at STOP. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5083 |
11864
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 If REGS is non-null and the `no_sub' field of BUFP is nonzero, we |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5085 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
|
5086 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
|
5087 |
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 We return -1 if no match, -2 if an internal error (such as the |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5089 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
|
5090 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
|
5091 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5092 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
|
5093 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
|
5094 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
|
5095 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
|
5096 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
|
5097 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
|
5098 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
|
5099 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
|
5100 { |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5101 int result; |
18262 | 5102 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5103 #ifdef emacs |
21482
9898a4994a12
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
21404
diff
changeset
|
5104 int charpos; |
9898a4994a12
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
21404
diff
changeset
|
5105 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
|
5106 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
|
5107 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
|
5108 #endif |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5109 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5110 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
|
5111 (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
|
5112 pos, 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
|
5113 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
|
5114 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5115 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
|
5116 |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
5117 |
11864
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 /* This is a separate function so that we can force an alloca cleanup |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5119 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
|
5120 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
|
5121 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
|
5122 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
|
5123 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
|
5124 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
|
5125 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
|
5126 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
|
5127 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
|
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 /* 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
|
5130 int mcnt; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5131 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
|
5132 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
|
5133 |
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 /* 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
|
5135 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
|
5136 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5137 /* Pointers into string1 and string2, just past the last characters in |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5138 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
|
5139 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
|
5140 |
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 /* 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
|
5142 re_char *d, *dend; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5143 |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5144 /* 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
|
5145 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
|
5146 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
|
5147 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
|
5148 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
|
5149 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5150 /* 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
|
5151 re_char *p = bufp->buffer; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5152 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
|
5153 |
18262 | 5154 /* 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
|
5155 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
|
5156 |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5157 /* Nonzero if BUFP is setup from a multibyte regex. */ |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5158 const boolean multibyte = RE_MULTIBYTE_P (bufp); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5159 |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5160 /* Nonzero if STRING1/STRING2 are multibyte. */ |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5161 const boolean target_multibyte = RE_TARGET_MULTIBYTE_P (bufp); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5162 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5163 /* 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
|
5164 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
|
5165 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
|
5166 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
|
5167 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
|
5168 to resume scanning the pattern; the second one is where to resume |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5169 scanning the strings. */ |
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5170 #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
|
5171 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
|
5172 #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
|
5173 #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
|
5174 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
|
5175 #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
|
5176 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5177 #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
|
5178 /* 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
|
5179 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
|
5180 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
|
5181 #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
|
5182 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5183 /* We fill all the registers internally, independent of what we |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5184 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
|
5185 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
|
5186 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
|
5187 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5188 /* 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
|
5189 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
|
5190 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
|
5191 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
|
5192 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
|
5193 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
|
5194 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
|
5195 #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
|
5196 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
|
5197 #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
|
5198 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5199 /* 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
|
5200 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
|
5201 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
|
5202 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
|
5203 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
|
5204 #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
|
5205 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
|
5206 #endif |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5207 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5208 /* 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
|
5209 allocate space for that if we're not allocating space for anything |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5210 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
|
5211 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
|
5212 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
|
5213 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
|
5214 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
|
5215 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
|
5216 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
|
5217 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5218 #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
|
5219 /* Counts the total number of registers pushed. */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5220 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
|
5221 #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
|
5222 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5223 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
|
5224 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5225 INIT_FAIL_STACK (); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5226 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5227 #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
|
5228 /* 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
|
5229 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
|
5230 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
|
5231 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
|
5232 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
|
5233 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
|
5234 { |
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
|
5235 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
|
5236 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
|
5237 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
|
5238 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
|
5239 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5240 if (!(regstart && regend && best_regstart && best_regend)) |
18262 | 5241 { |
5242 FREE_VARIABLES (); | |
5243 return -2; | |
5244 } | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5245 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5246 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
|
5247 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5248 /* We must initialize all our variables to NULL, so that |
18262 | 5249 `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
|
5250 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
|
5251 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5252 #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
|
5253 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5254 /* 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
|
5255 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
|
5256 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5257 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
|
5258 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
|
5259 } |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5260 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5261 /* 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
|
5262 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
|
5263 register information struct. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5264 for (reg = 1; reg < num_regs; reg++) |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5265 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
|
5266 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5267 /* We move `string1' into `string2' if the latter's empty -- but not if |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5268 `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
|
5269 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
|
5270 { |
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 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
|
5272 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
|
5273 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
|
5274 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
|
5275 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5276 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
|
5277 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
|
5278 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5279 /* `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
|
5280 `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
|
5281 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
|
5282 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
|
5283 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
|
5284 equal `string2'. */ |
28662
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
5285 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
|
5286 { |
28662
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
5287 /* 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
|
5288 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
|
5289 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
|
5290 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
|
5291 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5292 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
|
5293 { |
29296
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
5294 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
|
5295 { |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
5296 /* 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
|
5297 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
|
5298 /* BEWARE! |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
5299 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
|
5300 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
|
5301 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
|
5302 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
|
5303 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
|
5304 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
|
5305 end_match_2). */ |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
5306 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
|
5307 } |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
5308 else |
29296
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
5309 { /* 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
|
5310 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
|
5311 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
|
5312 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
|
5313 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
|
5314 } |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
5315 d = string1 + pos; |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
5316 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
|
5317 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5318 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5319 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
|
5320 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
|
5321 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
|
5322 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
|
5323 DEBUG_PRINT1 ("'\n"); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5324 |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5325 /* 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
|
5326 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
|
5327 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
|
5328 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
|
5329 { |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5330 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
|
5331 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5332 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
|
5333 { /* End of pattern means we might have succeeded. */ |
18262 | 5334 DEBUG_PRINT1 ("end of pattern ... "); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5335 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5336 /* If we haven't matched the entire string, and we want the |
18262 | 5337 longest match, try backtracking. */ |
5338 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
|
5339 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5340 /* 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
|
5341 as the best previous match. */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5342 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
|
5343 == 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
|
5344 /* 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
|
5345 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
|
5346 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5347 /* AIX compiler got confused when this was combined |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5348 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
|
5349 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
|
5350 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
|
5351 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
|
5352 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
|
5353 |
18262 | 5354 DEBUG_PRINT1 ("backtracking.\n"); |
5355 | |
5356 if (!FAIL_STACK_EMPTY ()) | |
5357 { /* More failure points to try. */ | |
5358 | |
5359 /* If exceeds best match so far, save it. */ | |
5360 if (!best_regs_set || best_match_p) | |
5361 { | |
5362 best_regs_set = true; | |
5363 match_end = d; | |
5364 | |
5365 DEBUG_PRINT1 ("\nSAVING match as best so far.\n"); | |
5366 | |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5367 for (reg = 1; reg < num_regs; reg++) |
18262 | 5368 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5369 best_regstart[reg] = regstart[reg]; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5370 best_regend[reg] = regend[reg]; |
18262 | 5371 } |
5372 } | |
5373 goto fail; | |
5374 } | |
5375 | |
5376 /* If no failure points, don't restore garbage. And if | |
5377 last match is real best match, don't restore second | |
5378 best one. */ | |
5379 else if (best_regs_set && !best_match_p) | |
5380 { | |
5381 restore_best_regs: | |
5382 /* Restore best match. It may happen that `dend == | |
5383 end_match_1' while the restored d is in string2. | |
5384 For example, the pattern `x.*y.*z' against the | |
5385 strings `x-' and `y-z-', if the two strings are | |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5386 not consecutive in memory. */ |
18262 | 5387 DEBUG_PRINT1 ("Restoring best registers.\n"); |
5388 | |
5389 d = match_end; | |
5390 dend = ((d >= string1 && d <= end1) | |
5391 ? 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
|
5392 |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5393 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
|
5394 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5395 regstart[reg] = best_regstart[reg]; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5396 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
|
5397 } |
18262 | 5398 } |
5399 } /* 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
|
5400 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5401 succeed_label: |
18262 | 5402 DEBUG_PRINT1 ("Accepting match.\n"); |
5403 | |
5404 /* If caller wants register contents data back, do it. */ | |
5405 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
|
5406 { |
18262 | 5407 /* Have the register data arrays been allocated? */ |
5408 if (bufp->regs_allocated == REGS_UNALLOCATED) | |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5409 { /* No. So allocate them with malloc. We need one |
18262 | 5410 extra element beyond `num_regs' for the `-1' marker |
5411 GNU code uses. */ | |
5412 regs->num_regs = MAX (RE_NREGS, num_regs + 1); | |
5413 regs->start = TALLOC (regs->num_regs, regoff_t); | |
5414 regs->end = TALLOC (regs->num_regs, regoff_t); | |
5415 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
|
5416 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5417 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
|
5418 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
|
5419 } |
18262 | 5420 bufp->regs_allocated = REGS_REALLOCATE; |
5421 } | |
5422 else if (bufp->regs_allocated == REGS_REALLOCATE) | |
5423 { /* Yes. If we need more elements than were already | |
5424 allocated, reallocate them. If we need fewer, just | |
5425 leave it alone. */ | |
5426 if (regs->num_regs < num_regs + 1) | |
5427 { | |
5428 regs->num_regs = num_regs + 1; | |
5429 RETALLOC (regs->start, regs->num_regs, regoff_t); | |
5430 RETALLOC (regs->end, regs->num_regs, regoff_t); | |
5431 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
|
5432 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5433 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
|
5434 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
|
5435 } |
18262 | 5436 } |
5437 } | |
5438 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
|
5439 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5440 /* These braces fend off a "empty body in an else-statement" |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5441 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
|
5442 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
|
5443 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5444 |
18262 | 5445 /* Convert the pointer data in `regstart' and `regend' to |
5446 indices. Register zero has to be set differently, | |
5447 since we haven't kept track of any info for it. */ | |
5448 if (regs->num_regs > 0) | |
5449 { | |
5450 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
|
5451 regs->end[0] = POINTER_TO_OFFSET (d); |
18262 | 5452 } |
5453 | |
5454 /* Go through the first `min (num_regs, regs->num_regs)' | |
5455 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
|
5456 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
|
5457 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5458 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
|
5459 regs->start[reg] = regs->end[reg] = -1; |
18262 | 5460 else |
5461 { | |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5462 regs->start[reg] |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5463 = (regoff_t) POINTER_TO_OFFSET (regstart[reg]); |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5464 regs->end[reg] |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5465 = (regoff_t) POINTER_TO_OFFSET (regend[reg]); |
18262 | 5466 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5467 } |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5468 |
18262 | 5469 /* If the regs structure we return has more elements than |
5470 were in the pattern, set the extra elements to -1. If | |
5471 we (re)allocated the registers, this is the case, | |
5472 because we always allocate enough to have at least one | |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5473 -1 at the end. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5474 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
|
5475 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
|
5476 } /* 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
|
5477 |
18262 | 5478 DEBUG_PRINT4 ("%u failure points pushed, %u popped (%u remain).\n", |
5479 nfailure_points_pushed, nfailure_points_popped, | |
5480 nfailure_points_pushed - nfailure_points_popped); | |
5481 DEBUG_PRINT2 ("%u registers pushed.\n", num_regs_pushed); | |
5482 | |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5483 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
|
5484 |
18262 | 5485 DEBUG_PRINT2 ("Returning %d from re_match_2.\n", mcnt); |
5486 | |
5487 FREE_VARIABLES (); | |
5488 return mcnt; | |
5489 } | |
5490 | |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5491 /* 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
|
5492 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
|
5493 { |
18262 | 5494 /* Ignore these. Used to ignore the n of succeed_n's which |
5495 currently have n == 0. */ | |
5496 case no_op: | |
5497 DEBUG_PRINT1 ("EXECUTING no_op.\n"); | |
5498 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
|
5499 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5500 case succeed: |
18262 | 5501 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
|
5502 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
|
5503 |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5504 /* Match the next n pattern characters exactly. The following |
18262 | 5505 byte in the pattern defines n, and the n bytes after that |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5506 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
|
5507 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
|
5508 mcnt = *p++; |
18262 | 5509 DEBUG_PRINT2 ("EXECUTING exactn %d.\n", mcnt); |
5510 | |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5511 /* 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
|
5512 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
|
5513 |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5514 #ifndef emacs |
18262 | 5515 /* This is written out as an if-else so we don't waste time |
5516 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
|
5517 if (RE_TRANSLATE_P (translate)) |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5518 do |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5519 { |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5520 PREFETCH (); |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5521 if (RE_TRANSLATE (translate, *d) != *p++) |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5522 { |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5523 d = dfail; |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5524 goto fail; |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5525 } |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5526 d++; |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5527 } |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5528 while (--mcnt); |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5529 else |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5530 do |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5531 { |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5532 PREFETCH (); |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5533 if (*d++ != *p++) |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5534 { |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5535 d = dfail; |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5536 goto fail; |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5537 } |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5538 } |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5539 while (--mcnt); |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5540 #else /* emacs */ |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5541 /* The cost of testing `translate' is comparatively small. */ |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5542 if (target_multibyte) |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5543 do |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5544 { |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5545 int pat_charlen, buf_charlen; |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5546 int pat_ch, buf_ch; |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5547 |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5548 PREFETCH (); |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5549 if (multibyte) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5550 pat_ch = STRING_CHAR_AND_LENGTH (p, pend - p, pat_charlen); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5551 else |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5552 { |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5553 pat_ch = RE_CHAR_TO_MULTIBYTE (*p); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5554 pat_charlen = 1; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5555 } |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5556 buf_ch = STRING_CHAR_AND_LENGTH (d, dend - d, buf_charlen); |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5557 |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5558 if (TRANSLATE (buf_ch) != pat_ch) |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5559 { |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5560 d = dfail; |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5561 goto fail; |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5562 } |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5563 |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5564 p += pat_charlen; |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5565 d += buf_charlen; |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5566 mcnt -= pat_charlen; |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5567 } |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5568 while (mcnt > 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
|
5569 else |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5570 do |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5571 { |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5572 int pat_charlen, buf_charlen; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5573 int pat_ch, buf_ch; |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5574 |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5575 PREFETCH (); |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5576 if (multibyte) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5577 { |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5578 pat_ch = STRING_CHAR_AND_LENGTH (p, pend - p, pat_charlen); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5579 if (CHAR_BYTE8_P (pat_ch)) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5580 pat_ch = CHAR_TO_BYTE8 (pat_ch); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5581 else |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5582 pat_ch = RE_CHAR_TO_UNIBYTE (pat_ch); |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5583 } |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5584 else |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5585 { |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5586 pat_ch = *p; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5587 pat_charlen = 1; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5588 } |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5589 buf_ch = RE_CHAR_TO_MULTIBYTE (*d); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5590 if (! CHAR_BYTE8_P (buf_ch)) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5591 { |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5592 buf_ch = TRANSLATE (buf_ch); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5593 buf_ch = RE_CHAR_TO_UNIBYTE (buf_ch); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5594 if (buf_ch < 0) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5595 buf_ch = *d; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5596 } |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5597 if (buf_ch != pat_ch) |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5598 { |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5599 d = dfail; |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5600 goto fail; |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5601 } |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5602 p += pat_charlen; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5603 d++; |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5604 } |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5605 while (--mcnt); |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
5606 #endif |
18262 | 5607 break; |
5608 | |
5609 | |
5610 /* 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
|
5611 case anychar: |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5612 { |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5613 int buf_charlen; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5614 re_wchar_t buf_ch; |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5615 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5616 DEBUG_PRINT1 ("EXECUTING anychar.\n"); |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5617 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5618 PREFETCH (); |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5619 buf_ch = RE_STRING_CHAR_AND_LENGTH (d, dend - d, buf_charlen, |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5620 target_multibyte); |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5621 buf_ch = TRANSLATE (buf_ch); |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5622 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5623 if ((!(bufp->syntax & RE_DOT_NEWLINE) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5624 && buf_ch == '\n') |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5625 || ((bufp->syntax & RE_DOT_NOT_NULL) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5626 && buf_ch == '\000')) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5627 goto fail; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5628 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5629 DEBUG_PRINT2 (" Matched `%d'.\n", *d); |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5630 d += buf_charlen; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5631 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5632 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
|
5633 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5634 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5635 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
|
5636 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
|
5637 { |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5638 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
|
5639 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
|
5640 int len; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5641 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5642 /* 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
|
5643 range table. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5644 re_char *range_table; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5645 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5646 /* Nonzero if there is a range table. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5647 int range_table_exists; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5648 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5649 /* 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
|
5650 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
|
5651 int count = 0; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5652 |
18262 | 5653 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
|
5654 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5655 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
|
5656 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5657 if (range_table_exists) |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5658 { |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5659 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
|
5660 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
|
5661 } |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5662 |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5663 PREFETCH (); |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5664 c = RE_STRING_CHAR_AND_LENGTH (d, dend - d, len, target_multibyte); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5665 if (target_multibyte) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5666 { |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5667 int c1; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5668 |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5669 c = TRANSLATE (c); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5670 c1 = RE_CHAR_TO_UNIBYTE (c); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5671 if (c1 >= 0) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5672 c = c1; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5673 } |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5674 else |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5675 { |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5676 int c1 = RE_CHAR_TO_MULTIBYTE (c); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5677 |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5678 if (! CHAR_BYTE8_P (c1)) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5679 { |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5680 c1 = TRANSLATE (c1); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5681 c1 = RE_CHAR_TO_UNIBYTE (c1); |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5682 if (c1 >= 0) |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5683 c = c1; |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5684 } |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5685 } |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5686 |
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
5687 if (c < (1 << BYTEWIDTH)) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5688 { /* Lookup bitmap. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5689 /* Cast to `unsigned' instead of `unsigned char' in |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5690 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
|
5691 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
|
5692 && 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
|
5693 not = !not; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5694 } |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5695 #ifdef emacs |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5696 else if (range_table_exists) |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5697 { |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5698 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
|
5699 |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
5700 if ( (class_bits & BIT_LOWER && ISLOWER (c)) |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
5701 | (class_bits & BIT_MULTIBYTE) |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5702 | (class_bits & BIT_PUNCT && ISPUNCT (c)) |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5703 | (class_bits & BIT_SPACE && ISSPACE (c)) |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5704 | (class_bits & BIT_UPPER && ISUPPER (c)) |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5705 | (class_bits & BIT_WORD && ISWORD (c))) |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5706 not = !not; |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5707 else |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5708 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
|
5709 } |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5710 #endif /* emacs */ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5711 |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5712 if (range_table_exists) |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5713 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
|
5714 else |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5715 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
|
5716 |
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 if (!not) goto fail; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5718 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5719 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
|
5720 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
|
5721 } |
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 |
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 |
18262 | 5724 /* 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
|
5725 The argument is the register number. The text |
18262 | 5726 matched within the group is recorded (in the internal |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5727 registers data structure) under the register number. */ |
18262 | 5728 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
|
5729 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
|
5730 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5731 /* 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
|
5732 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
|
5733 |
18262 | 5734 regstart[*p] = d; |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5735 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
|
5736 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
|
5737 |
18262 | 5738 /* 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
|
5739 p += 1; |
18262 | 5740 break; |
5741 | |
5742 | |
5743 /* 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
|
5744 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
|
5745 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
|
5746 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
|
5747 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5748 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
|
5749 /* Strictly speaking, there should be code such as: |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49276
diff
changeset
|
5750 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5751 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
|
5752 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
|
5753 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5754 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
|
5755 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
|
5756 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
|
5757 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
|
5758 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
|
5759 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
|
5760 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
|
5761 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
|
5762 |
18262 | 5763 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
|
5764 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
|
5765 |
18262 | 5766 /* 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
|
5767 p += 1; |
18262 | 5768 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
|
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 |
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 /* \<digit> has been turned into a `duplicate' command which is |
18262 | 5772 followed by the numeric value of <digit> as the register number. */ |
5773 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
|
5774 { |
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
|
5775 register re_char *d2, *dend2; |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5776 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
|
5777 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
|
5778 |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5779 /* Can't back reference a group which we've never matched. */ |
18262 | 5780 if (REG_UNSET (regstart[regno]) || REG_UNSET (regend[regno])) |
5781 goto fail; | |
5782 | |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5783 /* Where in input to try to start matching. */ |
18262 | 5784 d2 = regstart[regno]; |
5785 | |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5786 /* 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
|
5787 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
|
5788 |
18262 | 5789 /* Where to stop matching; if both the place to start and |
5790 the place to stop matching are in the same string, then | |
5791 set to the place to stop, otherwise, for now have to use | |
5792 the end of the first string. */ | |
5793 | |
5794 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
|
5795 == 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
|
5796 ? 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
|
5797 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
|
5798 { |
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 /* If necessary, advance to next segment in register |
18262 | 5800 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
|
5801 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
|
5802 { |
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 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
|
5804 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
|
5805 |
18262 | 5806 /* End of string1 => advance to string2. */ |
5807 d2 = string2; | |
5808 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
|
5809 } |
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 /* 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
|
5811 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
|
5812 |
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 /* 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
|
5814 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
|
5815 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5816 /* 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
|
5817 mcnt = dend - d; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5818 |
11864
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 /* Want how many consecutive characters we can match in |
18262 | 5820 one shot, so, if necessary, adjust the count. */ |
5821 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
|
5822 mcnt = dend2 - d2; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5823 |
11864
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 /* Compare that many; failure if mismatch, else move |
18262 | 5825 past them. */ |
21562
afd0a04106ec
Use RE_TRANSLATE_P to check whether translation is
Andreas Schwab <schwab@suse.de>
parents:
21558
diff
changeset
|
5826 if (RE_TRANSLATE_P (translate) |
90764
324e371fbbe5
(GET_CHAR_BEFORE_2, GET_CHAR_AFTER): Check the variable
Kenichi Handa <handa@m17n.org>
parents:
90757
diff
changeset
|
5827 ? bcmp_translate (d, d2, mcnt, translate, target_multibyte) |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5828 : 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
|
5829 { |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5830 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
|
5831 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
|
5832 } |
11864
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 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
|
5834 } |
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 } |
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 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
|
5837 |
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 |
18262 | 5839 /* 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
|
5840 (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
|
5841 case begline: |
18262 | 5842 DEBUG_PRINT1 ("EXECUTING begline.\n"); |
5843 | |
5844 if (AT_STRINGS_BEG (d)) | |
5845 { | |
5846 if (!bufp->not_bol) break; | |
5847 } | |
28662
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
5848 else |
18262 | 5849 { |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
5850 unsigned c; |
28662
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
5851 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
|
5852 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
|
5853 break; |
18262 | 5854 } |
5855 /* In all other cases, we fail. */ | |
5856 goto fail; | |
5857 | |
5858 | |
5859 /* 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
|
5860 case endline: |
18262 | 5861 DEBUG_PRINT1 ("EXECUTING endline.\n"); |
5862 | |
5863 if (AT_STRINGS_END (d)) | |
5864 { | |
5865 if (!bufp->not_eol) break; | |
5866 } | |
29296
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
5867 else |
18262 | 5868 { |
29296
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
5869 PREFETCH_NOLIMIT (); |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5870 if (*d == '\n') |
29296
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
5871 break; |
18262 | 5872 } |
5873 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
|
5874 |
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 /* Match at the very beginning of the data. */ |
18262 | 5877 case begbuf: |
5878 DEBUG_PRINT1 ("EXECUTING begbuf.\n"); | |
5879 if (AT_STRINGS_BEG (d)) | |
5880 break; | |
5881 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
|
5882 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5883 |
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 /* Match at the very end of the data. */ |
18262 | 5885 case endbuf: |
5886 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
|
5887 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
|
5888 break; |
18262 | 5889 goto fail; |
5890 | |
5891 | |
5892 /* on_failure_keep_string_jump is used to optimize `.*\n'. It | |
5893 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
|
5894 `POP_FAILURE_POINT' will keep the current value for the |
18262 | 5895 string, instead of restoring it. To see why, consider |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
5896 matching `foo\nbar' against `.*\n'. The .* matches the foo; |
18262 | 5897 then the . fails against the \n. But the next thing we want |
5898 to do is match the \n against the \n; if we restored the | |
5899 string value, we would be back at the foo. | |
5900 | |
5901 Because this is used only in specific cases, we don't need to | |
5902 check all the things that `on_failure_jump' does, to make | |
5903 sure the right things get saved on the stack. Hence we don't | |
5904 share its code. The only reason to push anything on the | |
5905 stack at all is that otherwise we would have to change | |
5906 `anychar's code to do something besides goto fail in this | |
5907 case; that seems worse than this. */ | |
5908 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
|
5909 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
|
5910 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
|
5911 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
|
5912 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5913 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
|
5914 break; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5915 |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5916 /* 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
|
5917 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
|
5918 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
|
5919 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
|
5920 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
|
5921 detect a cycle (between different instantiations of the same |
47368
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5922 loop). |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5923 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
|
5924 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
|
5925 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
|
5926 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
|
5927 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
|
5928 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
|
5929 the loop. */ |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5930 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
|
5931 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
|
5932 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
|
5933 mcnt, p + mcnt); |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5934 |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5935 assert ((re_opcode_t)p[-4] == no_op); |
47368
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5936 { |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5937 int cycle = 0; |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5938 CHECK_INFINITE_LOOP (p - 4, d); |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5939 if (!cycle) |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5940 /* If there's a cycle, just continue without pushing |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5941 this failure point. The failure point is the "try again" |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5942 option, which shouldn't be tried. |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5943 We want (x?)*?y\1z to match both xxyz and xxyxz. */ |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5944 PUSH_FAILURE_POINT (p - 3, d); |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5945 } |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5946 break; |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5947 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5948 /* 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
|
5949 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
|
5950 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
|
5951 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
|
5952 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
|
5953 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
|
5954 mcnt, p + mcnt); |
47368
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5955 { |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5956 int cycle = 0; |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5957 CHECK_INFINITE_LOOP (p - 3, d); |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5958 if (cycle) |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5959 /* If there's a cycle, get out of the loop, as if the matching |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5960 had failed. We used to just `goto fail' here, but that was |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5961 aborting the search a bit too early: we want to keep the |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5962 empty-loop-match and keep matching after the loop. |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5963 We want (x?)*y\1z to match both xxyz and xxyxz. */ |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5964 p += mcnt; |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5965 else |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5966 PUSH_FAILURE_POINT (p - 3, d); |
3f5cad2781e7
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47337
diff
changeset
|
5967 } |
18262 | 5968 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
|
5969 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5970 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5971 /* Uses of on_failure_jump: |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5972 |
18262 | 5973 Each alternative starts with an on_failure_jump that points |
5974 to the beginning of the next alternative. Each alternative | |
5975 except the last ends with a jump that in effect jumps past | |
5976 the rest of the alternatives. (They really jump to the | |
5977 ending jump of the following alternative, because tensioning | |
5978 these jumps is a hassle.) | |
5979 | |
5980 Repeats start with an on_failure_jump that points past both | |
5981 the repetition text and either the following jump or | |
5982 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
|
5983 case on_failure_jump: |
18262 | 5984 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
|
5985 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
|
5986 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
|
5987 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5988 PUSH_FAILURE_POINT (p -3, d); |
18262 | 5989 break; |
5990 | |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5991 /* 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
|
5992 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
|
5993 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
|
5994 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
|
5995 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
|
5996 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
|
5997 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
|
5998 case on_failure_jump_smart: |
18262 | 5999 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
|
6000 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
|
6001 mcnt, p + mcnt); |
18262 | 6002 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6003 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
|
6004 /* 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
|
6005 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
|
6006 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
|
6007 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
6008 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
|
6009 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
|
6010 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
6011 EXTRACT_NUMBER (mcnt, p2 - 2); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
6012 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
6013 /* 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
|
6014 we are expecting. */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
6015 assert (skip_one_char (p1) == p2 - 3); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
6016 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
|
6017 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
|
6018 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
|
6019 { |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
6020 /* 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
|
6021 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
|
6022 *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
|
6023 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
|
6024 } |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
6025 else |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
6026 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
6027 /* 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
|
6028 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
|
6029 *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
|
6030 } |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
6031 DEBUG_STATEMENT (debug -= 2); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6032 } |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
6033 break; |
18262 | 6034 |
6035 /* Unconditionally jump (without popping any failure points). */ | |
6036 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
|
6037 unconditional_jump: |
32823
2a7f61d7ae12
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
32805
diff
changeset
|
6038 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
|
6039 EXTRACT_NUMBER_AND_INCR (mcnt, p); /* Get the amount to jump. */ |
18262 | 6040 DEBUG_PRINT2 ("EXECUTING jump %d ", mcnt); |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
6041 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
|
6042 DEBUG_PRINT2 ("(to %p).\n", p); |
18262 | 6043 break; |
6044 | |
6045 | |
6046 /* Have to succeed matching what follows at least n times. | |
6047 After that, handle like `on_failure_jump'. */ | |
6048 case succeed_n: | |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6049 /* Signedness doesn't matter since we only compare MCNT to 0. */ |
18262 | 6050 EXTRACT_NUMBER (mcnt, p + 2); |
6051 DEBUG_PRINT2 ("EXECUTING succeed_n %d.\n", mcnt); | |
6052 | |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
6053 /* 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
|
6054 if (mcnt != 0) |
18262 | 6055 { |
32954
f77e6c51dd07
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32891
diff
changeset
|
6056 /* 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
|
6057 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
|
6058 mcnt--; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6059 p += 4; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6060 PUSH_NUMBER (p2, mcnt); |
18262 | 6061 } |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
6062 else |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
6063 /* 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
|
6064 goto on_failure; |
18262 | 6065 break; |
6066 | |
6067 case jump_n: | |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6068 /* Signedness doesn't matter since we only compare MCNT to 0. */ |
18262 | 6069 EXTRACT_NUMBER (mcnt, p + 2); |
6070 DEBUG_PRINT2 ("EXECUTING jump_n %d.\n", mcnt); | |
6071 | |
6072 /* 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
|
6073 if (mcnt != 0) |
18262 | 6074 { |
32954
f77e6c51dd07
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32891
diff
changeset
|
6075 /* 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
|
6076 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
|
6077 mcnt--; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6078 PUSH_NUMBER (p2, mcnt); |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
6079 goto unconditional_jump; |
18262 | 6080 } |
6081 /* 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
|
6082 else |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6083 p += 4; |
18262 | 6084 break; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6085 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6086 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
|
6087 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6088 unsigned char *p2; /* Location of the counter. */ |
18262 | 6089 DEBUG_PRINT1 ("EXECUTING set_number_at.\n"); |
6090 | |
6091 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
|
6092 /* 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
|
6093 p2 = (unsigned char*) p + mcnt; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6094 /* Signedness doesn't matter since we only copy MCNT's bits . */ |
18262 | 6095 EXTRACT_NUMBER_AND_INCR (mcnt, p); |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6096 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
|
6097 PUSH_NUMBER (p2, mcnt); |
18262 | 6098 break; |
6099 } | |
13722
e2669b8a46e2
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
13565
diff
changeset
|
6100 |
e2669b8a46e2
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
13565
diff
changeset
|
6101 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
|
6102 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
|
6103 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
|
6104 DEBUG_PRINT2 ("EXECUTING %swordbound.\n", not?"not":""); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6105 |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
6106 /* 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
|
6107 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6108 /* 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
|
6109 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
|
6110 not = !not; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6111 else |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6112 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6113 /* 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
|
6114 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
|
6115 re_wchar_t c1, c2; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6116 int s1, s2; |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
6117 int dummy; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6118 #ifdef emacs |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
6119 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
|
6120 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
|
6121 UPDATE_SYNTAX_TABLE (charpos); |
18262 | 6122 #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
|
6123 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
|
6124 s1 = SYNTAX (c1); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6125 #ifdef emacs |
20633
063756386696
(re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20455
diff
changeset
|
6126 UPDATE_SYNTAX_TABLE_FORWARD (charpos + 1); |
18262 | 6127 #endif |
29296
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
6128 PREFETCH_NOLIMIT (); |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
6129 GET_CHAR_AFTER (c2, d, dummy); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6130 s2 = SYNTAX (c2); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6131 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6132 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
|
6133 ((s1 == Sword) != (s2 == Sword)) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6134 /* Case 3: Both of S1 and S2 are Sword, and macro |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
6135 WORD_BOUNDARY_P (C1, C2) returns nonzero. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6136 || ((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
|
6137 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
|
6138 } |
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
|
6139 if (not) |
13722
e2669b8a46e2
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
13565
diff
changeset
|
6140 break; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6141 else |
13722
e2669b8a46e2
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
13565
diff
changeset
|
6142 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
|
6143 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6144 case wordbeg: |
18262 | 6145 DEBUG_PRINT1 ("EXECUTING wordbeg.\n"); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6146 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6147 /* We FAIL in one of the following cases: */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6148 |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
6149 /* 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
|
6150 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
|
6151 goto fail; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6152 else |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6153 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6154 /* 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
|
6155 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
|
6156 re_wchar_t c1, c2; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6157 int s1, s2; |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
6158 int dummy; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6159 #ifdef emacs |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
6160 int offset = PTR_TO_OFFSET (d); |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
6161 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
|
6162 UPDATE_SYNTAX_TABLE (charpos); |
18262 | 6163 #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
|
6164 PREFETCH (); |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
6165 GET_CHAR_AFTER (c2, d, dummy); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6166 s2 = SYNTAX (c2); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49276
diff
changeset
|
6167 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6168 /* Case 2: S2 is not Sword. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6169 if (s2 != Sword) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6170 goto fail; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6171 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6172 /* 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
|
6173 if (!AT_STRINGS_BEG (d)) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6174 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6175 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
|
6176 #ifdef emacs |
20633
063756386696
(re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20455
diff
changeset
|
6177 UPDATE_SYNTAX_TABLE_BACKWARD (charpos - 1); |
18262 | 6178 #endif |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6179 s1 = SYNTAX (c1); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6180 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6181 /* ... and S1 is Sword, and WORD_BOUNDARY_P (C1, C2) |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
6182 returns 0. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6183 if ((s1 == Sword) && !WORD_BOUNDARY_P (c1, c2)) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6184 goto fail; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6185 } |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6186 } |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6187 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
|
6188 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6189 case wordend: |
18262 | 6190 DEBUG_PRINT1 ("EXECUTING wordend.\n"); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6191 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6192 /* We FAIL in one of the following cases: */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6193 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6194 /* 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
|
6195 if (AT_STRINGS_BEG (d)) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6196 goto fail; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6197 else |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6198 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6199 /* 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
|
6200 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
|
6201 re_wchar_t c1, c2; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6202 int s1, s2; |
89061
9a9b54d06f3d
* regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents:
88387
diff
changeset
|
6203 int dummy; |
20633
063756386696
(re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20455
diff
changeset
|
6204 #ifdef emacs |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
6205 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
|
6206 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
|
6207 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
|
6208 #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
|
6209 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
|
6210 s1 = SYNTAX (c1); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6211 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6212 /* Case 2: S1 is not Sword. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6213 if (s1 != Sword) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6214 goto fail; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6215 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6216 /* 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
|
6217 if (!AT_STRINGS_END (d)) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6218 { |
29296
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
6219 PREFETCH_NOLIMIT (); |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
6220 GET_CHAR_AFTER (c2, d, dummy); |
20633
063756386696
(re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20455
diff
changeset
|
6221 #ifdef emacs |
063756386696
(re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20455
diff
changeset
|
6222 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
|
6223 #endif |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6224 s2 = SYNTAX (c2); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6225 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6226 /* ... and S2 is Sword, and WORD_BOUNDARY_P (C1, C2) |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
6227 returns 0. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6228 if ((s2 == Sword) && !WORD_BOUNDARY_P (c1, c2)) |
18262 | 6229 goto fail; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6230 } |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6231 } |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6232 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
|
6233 |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6234 case symbeg: |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6235 DEBUG_PRINT1 ("EXECUTING symbeg.\n"); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6236 |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6237 /* We FAIL in one of the following cases: */ |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6238 |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
6239 /* Case 1: D is at the end of string. */ |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6240 if (AT_STRINGS_END (d)) |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6241 goto fail; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6242 else |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6243 { |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6244 /* C1 is the character before D, S1 is the syntax of C1, C2 |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6245 is the character at D, and S2 is the syntax of C2. */ |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6246 re_wchar_t c1, c2; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6247 int s1, s2; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6248 #ifdef emacs |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6249 int offset = PTR_TO_OFFSET (d); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6250 int charpos = SYNTAX_TABLE_BYTE_TO_CHAR (offset); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6251 UPDATE_SYNTAX_TABLE (charpos); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6252 #endif |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6253 PREFETCH (); |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
6254 c2 = RE_STRING_CHAR (d, dend - d, target_multibyte); |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6255 s2 = SYNTAX (c2); |
74143
c4cd6820a92e
Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents:
73229
diff
changeset
|
6256 |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6257 /* Case 2: S2 is neither Sword nor Ssymbol. */ |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6258 if (s2 != Sword && s2 != Ssymbol) |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6259 goto fail; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6260 |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6261 /* Case 3: D is not at the beginning of string ... */ |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6262 if (!AT_STRINGS_BEG (d)) |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6263 { |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6264 GET_CHAR_BEFORE_2 (c1, d, string1, end1, string2, end2); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6265 #ifdef emacs |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6266 UPDATE_SYNTAX_TABLE_BACKWARD (charpos - 1); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6267 #endif |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6268 s1 = SYNTAX (c1); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6269 |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6270 /* ... and S1 is Sword or Ssymbol. */ |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6271 if (s1 == Sword || s1 == Ssymbol) |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6272 goto fail; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6273 } |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6274 } |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6275 break; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6276 |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6277 case symend: |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6278 DEBUG_PRINT1 ("EXECUTING symend.\n"); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6279 |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6280 /* We FAIL in one of the following cases: */ |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6281 |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6282 /* Case 1: D is at the beginning of string. */ |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6283 if (AT_STRINGS_BEG (d)) |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6284 goto fail; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6285 else |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6286 { |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6287 /* C1 is the character before D, S1 is the syntax of C1, C2 |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6288 is the character at D, and S2 is the syntax of C2. */ |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6289 re_wchar_t c1, c2; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6290 int s1, s2; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6291 #ifdef emacs |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6292 int offset = PTR_TO_OFFSET (d) - 1; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6293 int charpos = SYNTAX_TABLE_BYTE_TO_CHAR (offset); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6294 UPDATE_SYNTAX_TABLE (charpos); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6295 #endif |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6296 GET_CHAR_BEFORE_2 (c1, d, string1, end1, string2, end2); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6297 s1 = SYNTAX (c1); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6298 |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6299 /* Case 2: S1 is neither Ssymbol nor Sword. */ |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6300 if (s1 != Sword && s1 != Ssymbol) |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6301 goto fail; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6302 |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6303 /* Case 3: D is not at the end of string ... */ |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6304 if (!AT_STRINGS_END (d)) |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6305 { |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6306 PREFETCH_NOLIMIT (); |
90757
8780137cabbc
(RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
6307 c2 = RE_STRING_CHAR (d, dend - d, target_multibyte); |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6308 #ifdef emacs |
59039
2e087371b9ff
(re_match_2_internal) <symend, wordend>:
Richard M. Stallman <rms@gnu.org>
parents:
58784
diff
changeset
|
6309 UPDATE_SYNTAX_TABLE_FORWARD (charpos + 1); |
55690
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6310 #endif |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6311 s2 = SYNTAX (c2); |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6312 |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6313 /* ... and S2 is Sword or Ssymbol. */ |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6314 if (s2 == Sword || s2 == Ssymbol) |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6315 goto fail; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6316 } |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6317 } |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6318 break; |
daeeb5ef2d95
Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55530
diff
changeset
|
6319 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6320 case syntaxspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6321 case notsyntaxspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6322 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
|
6323 mcnt = *p++; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6324 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
|
6325 PREFETCH (); |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6326 #ifdef emacs |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6327 { |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
6328 int offset = PTR_TO_OFFSET (d); |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
6329 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
|
6330 UPDATE_SYNTAX_TABLE (pos1); |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6331 } |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6332 #endif |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6333 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6334 int len; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6335 re_wchar_t c; |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6336 |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
6337 GET_CHAR_AFTER (c, d, len); |
28279
24a23e27dac6
(enum syntaxcode): Provide default for non-Emacs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28268
diff
changeset
|
6338 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
|
6339 goto fail; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6340 d += len; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6341 } |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6342 break; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6343 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6344 #ifdef emacs |
18262 | 6345 case before_dot: |
6346 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
|
6347 if (PTR_BYTE_POS (d) >= PT_BYTE) |
18262 | 6348 goto fail; |
6349 break; | |
6350 | |
6351 case at_dot: | |
6352 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
|
6353 if (PTR_BYTE_POS (d) != PT_BYTE) |
18262 | 6354 goto fail; |
6355 break; | |
6356 | |
6357 case after_dot: | |
6358 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
|
6359 if (PTR_BYTE_POS (d) <= PT_BYTE) |
18262 | 6360 goto fail; |
6361 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
|
6362 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6363 case categoryspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6364 case notcategoryspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6365 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
|
6366 mcnt = *p++; |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6367 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
|
6368 PREFETCH (); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6369 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6370 int len; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6371 re_wchar_t c; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6372 |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
6373 GET_CHAR_AFTER (c, d, len); |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6374 if ((!CHAR_HAS_CATEGORY (c, mcnt)) ^ not) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6375 goto fail; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6376 d += len; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6377 } |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6378 break; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6379 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
6380 #endif /* emacs */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6381 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6382 default: |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6383 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
|
6384 } |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6385 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
|
6386 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6387 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6388 /* 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
|
6389 fail: |
32823
2a7f61d7ae12
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
32805
diff
changeset
|
6390 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
|
6391 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
|
6392 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6393 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
|
6394 /* 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
|
6395 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
|
6396 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
|
6397 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
|
6398 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
6399 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
|
6400 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
|
6401 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
|
6402 |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
6403 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
|
6404 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
|
6405 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
|
6406 /* Fallthrough */ |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
6407 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
6408 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
|
6409 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
|
6410 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
|
6411 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
|
6412 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
|
6413 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
|
6414 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
|
6415 break; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
6416 |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
6417 case no_op: |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
6418 /* 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
|
6419 goto fail; |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
6420 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
6421 default: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
6422 abort(); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
6423 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
6424 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
6425 assert (p >= bufp->buffer && p <= pend); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6426 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6427 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
|
6428 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
|
6429 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6430 else |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6431 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
|
6432 } /* 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
|
6433 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6434 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
|
6435 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
|
6436 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6437 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
|
6438 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6439 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
|
6440 } /* 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
|
6441 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6442 /* 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
|
6443 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6444 /* 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
|
6445 bytes; nonzero otherwise. */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6446 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6447 static int |
90764
324e371fbbe5
(GET_CHAR_BEFORE_2, GET_CHAR_AFTER): Check the variable
Kenichi Handa <handa@m17n.org>
parents:
90757
diff
changeset
|
6448 bcmp_translate (s1, s2, len, translate, target_multibyte) |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
6449 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
|
6450 register int len; |
13250
52e053f46f76
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard M. Stallman <rms@gnu.org>
parents:
13100
diff
changeset
|
6451 RE_TRANSLATE_TYPE translate; |
90764
324e371fbbe5
(GET_CHAR_BEFORE_2, GET_CHAR_AFTER): Check the variable
Kenichi Handa <handa@m17n.org>
parents:
90757
diff
changeset
|
6452 const int target_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
|
6453 { |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
6454 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
|
6455 re_char *p1_end = s1 + len; |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
6456 re_char *p2_end = s2 + len; |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
6457 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
6458 /* 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
|
6459 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
|
6460 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
|
6461 { |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
6462 int p1_charlen, p2_charlen; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
6463 re_wchar_t p1_ch, p2_ch; |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
6464 |
89455
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
6465 GET_CHAR_AFTER (p1_ch, p1, p1_charlen); |
ba48a280779d
(GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents:
89176
diff
changeset
|
6466 GET_CHAR_AFTER (p2_ch, p2, p2_charlen); |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
6467 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
6468 if (RE_TRANSLATE (translate, p1_ch) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
6469 != 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
|
6470 return 1; |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
6471 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
6472 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
|
6473 } |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
6474 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
6475 if (p1 != p1_end || p2 != p2_end) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
6476 return 1; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
6477 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6478 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
|
6479 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6480 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6481 /* 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
|
6482 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6483 /* 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
|
6484 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
|
6485 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
|
6486 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6487 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
|
6488 are set in BUFP on entry. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6489 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6490 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
|
6491 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6492 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
|
6493 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
|
6494 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
|
6495 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
|
6496 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
|
6497 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6498 reg_errcode_t ret; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6499 |
72925
e47e040fc9da
(re_compile_pattern): Set gl_state.current_syntax_table.
Richard M. Stallman <rms@gnu.org>
parents:
69073
diff
changeset
|
6500 #ifdef emacs |
e47e040fc9da
(re_compile_pattern): Set gl_state.current_syntax_table.
Richard M. Stallman <rms@gnu.org>
parents:
69073
diff
changeset
|
6501 gl_state.current_syntax_table = current_buffer->syntax_table; |
e47e040fc9da
(re_compile_pattern): Set gl_state.current_syntax_table.
Richard M. Stallman <rms@gnu.org>
parents:
69073
diff
changeset
|
6502 #endif |
e47e040fc9da
(re_compile_pattern): Set gl_state.current_syntax_table.
Richard M. Stallman <rms@gnu.org>
parents:
69073
diff
changeset
|
6503 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6504 /* 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
|
6505 (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
|
6506 bufp->regs_allocated = REGS_UNALLOCATED; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6507 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6508 /* 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
|
6509 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
|
6510 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
|
6511 bufp->no_sub = 0; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6512 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
6513 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
|
6514 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6515 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
|
6516 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
|
6517 return gettext (re_error_msgid[(int) ret]); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6518 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6519 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
|
6520 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6521 /* 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
|
6522 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
|
6523 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6524 #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
|
6525 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6526 /* 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
|
6527 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
|
6528 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6529 char * |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6530 # 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
|
6531 /* 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
|
6532 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
|
6533 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
|
6534 weak_function |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6535 # 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
|
6536 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
|
6537 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
|
6538 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6539 reg_errcode_t ret; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6540 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6541 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
|
6542 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6543 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
|
6544 /* 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
|
6545 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
|
6546 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
|
6547 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6548 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6549 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
|
6550 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6551 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
|
6552 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
|
6553 /* 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
|
6554 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
|
6555 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
|
6556 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6557 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
|
6558 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
|
6559 /* 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
|
6560 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
|
6561 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6562 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6563 /* 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
|
6564 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
|
6565 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6566 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
|
6567 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6568 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
|
6569 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
|
6570 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6571 /* 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
|
6572 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
|
6573 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6574 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6575 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6576 int |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6577 # 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
|
6578 weak_function |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6579 # 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
|
6580 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
|
6581 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
|
6582 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6583 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
|
6584 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
|
6585 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
|
6586 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6587 #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
|
6588 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6589 /* 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
|
6590 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6591 #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
|
6592 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6593 /* 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
|
6594 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6595 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
|
6596 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
|
6597 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6598 `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
|
6599 `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
|
6600 `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
|
6601 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
|
6602 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
|
6603 `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
|
6604 `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
|
6605 `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
|
6606 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6607 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
|
6608 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6609 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
|
6610 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6611 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
|
6612 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
|
6613 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6614 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
|
6615 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
|
6616 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6617 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
|
6618 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
|
6619 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6620 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
|
6621 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
|
6622 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
|
6623 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6624 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
|
6625 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
|
6626 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6627 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
|
6628 regcomp (preg, pattern, cflags) |
40650
ded4aa3c81b2
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39718
diff
changeset
|
6629 regex_t *__restrict preg; |
ded4aa3c81b2
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39718
diff
changeset
|
6630 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
|
6631 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
|
6632 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6633 reg_errcode_t ret; |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
6634 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
|
6635 = (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
|
6636 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
|
6637 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6638 /* 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
|
6639 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
|
6640 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
|
6641 preg->used = 0; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6642 |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6643 /* Try to allocate space for the fastmap. */ |
69039
f717c65a39d7
* regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
69038
diff
changeset
|
6644 preg->fastmap = (char *) malloc (1 << BYTEWIDTH); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6645 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6646 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
|
6647 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6648 unsigned i; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6649 |
13250
52e053f46f76
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard M. Stallman <rms@gnu.org>
parents:
13100
diff
changeset
|
6650 preg->translate |
69039
f717c65a39d7
* regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
69038
diff
changeset
|
6651 = (RE_TRANSLATE_TYPE) malloc (CHAR_SET_SIZE |
69073 | 6652 * 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
|
6653 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
|
6654 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
|
6655 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6656 /* 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
|
6657 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
|
6658 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
|
6659 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6660 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
|
6661 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
|
6662 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6663 /* 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
|
6664 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
|
6665 { /* 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
|
6666 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
|
6667 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
|
6668 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6669 else |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6670 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
|
6671 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6672 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
|
6673 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6674 /* 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
|
6675 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
|
6676 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
|
6677 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6678 /* 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
|
6679 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
|
6680 if (ret == REG_ERPAREN) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6681 ret = REG_EPAREN; |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6682 |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6683 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
|
6684 { /* 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
|
6685 buffer. */ |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6686 re_compile_fastmap (preg); |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6687 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
|
6688 { /* 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
|
6689 free (preg->fastmap); |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6690 preg->fastmap = NULL; |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6691 } |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6692 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6693 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
|
6694 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6695 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
|
6696 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6697 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6698 /* 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
|
6699 string STRING. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6700 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6701 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
|
6702 `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
|
6703 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
|
6704 corresponding matched substrings. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6705 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6706 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
|
6707 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
|
6708 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
|
6709 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6710 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
|
6711 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6712 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
|
6713 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
|
6714 const regex_t *__restrict preg; |
ded4aa3c81b2
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39718
diff
changeset
|
6715 const char *__restrict string; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6716 size_t nmatch; |
48205
b8b2159aed5e
(regexec): Fix pmatch declaration.
Dave Love <fx@gnu.org>
parents:
47368
diff
changeset
|
6717 regmatch_t pmatch[__restrict_arr]; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6718 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
|
6719 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6720 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
|
6721 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
|
6722 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
|
6723 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
|
6724 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
|
6725 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6726 private_preg = *preg; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6727 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6728 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
|
6729 private_preg.not_eol = !!(eflags & REG_NOTEOL); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6730 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6731 /* 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
|
6732 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
|
6733 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
|
6734 private_preg.regs_allocated = REGS_FIXED; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6735 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6736 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
|
6737 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6738 regs.num_regs = nmatch; |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
6739 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
|
6740 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
|
6741 return (int) REG_NOMATCH; |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
6742 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
|
6743 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6744 |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6745 /* 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
|
6746 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
|
6747 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
|
6748 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
|
6749 '\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
|
6750 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
|
6751 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
|
6752 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
|
6753 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6754 /* 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
|
6755 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
|
6756 /* 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
|
6757 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
|
6758 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6759 /* 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
|
6760 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
|
6761 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6762 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
|
6763 { |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6764 unsigned r; |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6765 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6766 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
|
6767 { |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6768 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
|
6769 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
|
6770 } |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6771 } |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6772 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6773 /* 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
|
6774 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
|
6775 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6776 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6777 /* 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
|
6778 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
|
6779 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6780 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
|
6781 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6782 |
74955
0b7286cbaf0c
(regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents:
74323
diff
changeset
|
6783 /* Returns a message corresponding to an error code, ERR_CODE, returned |
0b7286cbaf0c
(regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents:
74323
diff
changeset
|
6784 from either regcomp or regexec. We don't use PREG here. |
0b7286cbaf0c
(regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents:
74323
diff
changeset
|
6785 |
0b7286cbaf0c
(regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents:
74323
diff
changeset
|
6786 ERR_CODE was previously called ERRCODE, but that name causes an |
0b7286cbaf0c
(regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents:
74323
diff
changeset
|
6787 error with msvc8 compiler. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6788 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6789 size_t |
74955
0b7286cbaf0c
(regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents:
74323
diff
changeset
|
6790 regerror (err_code, preg, errbuf, errbuf_size) |
0b7286cbaf0c
(regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents:
74323
diff
changeset
|
6791 int err_code; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6792 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
|
6793 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
|
6794 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
|
6795 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6796 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
|
6797 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
|
6798 |
74955
0b7286cbaf0c
(regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents:
74323
diff
changeset
|
6799 if (err_code < 0 |
0b7286cbaf0c
(regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents:
74323
diff
changeset
|
6800 || err_code >= (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
|
6801 /* 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
|
6802 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
|
6803 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
|
6804 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
|
6805 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
|
6806 |
74955
0b7286cbaf0c
(regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents:
74323
diff
changeset
|
6807 msg = gettext (re_error_msgid[err_code]); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6808 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6809 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
|
6810 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6811 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
|
6812 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6813 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
|
6814 { |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6815 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
|
6816 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
|
6817 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6818 else |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6819 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
|
6820 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6821 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6822 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
|
6823 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6824 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
|
6825 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6826 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6827 /* 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
|
6828 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6829 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
|
6830 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
|
6831 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
|
6832 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6833 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
|
6834 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
|
6835 preg->buffer = NULL; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6836 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6837 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
|
6838 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
|
6839 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6840 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
|
6841 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
|
6842 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
|
6843 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
|
6844 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6845 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
|
6846 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
|
6847 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
|
6848 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6849 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
|
6850 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6851 #endif /* not emacs */ |
52401 | 6852 |
6853 /* arch-tag: 4ffd68ba-2a9e-435b-a21a-018990f9eeb2 | |
6854 (do not change this comment) */ |