annotate src/regex.c @ 107777:13c077500eb3

2010-04-04 John Wiegley <jwiegley@gmail.com> * ido.el (ido-use-virtual-buffers): New variable to indicate whether "virtual buffer" support is enabled for IDO. Essentially it works as follows: Say you are visiting a file and the buffer gets cleaned up by mignight.el. Later, you want to switch to that buffer, but find it's no longer open. With virtual buffers enabled, the buffer name stays in the buffer list (using the ido-virtual face, and always at the end), and if you select it, it opens the file back up again. This allows you to think less about whether recently opened files are still open or not. Most of the time you can quit Emacs, restart, and then switch to a file buffer that was previously open as if it still were. NOTE: This feature has been present in iswitchb for several years now, and I'm porting the same logic to IDO. (ido-virtual): Face used to indicate virtual buffers in the list. (ido-buffer-internal): If a buffer is chosen, and no such buffer exists, but a virtual buffer of that name does (which would be why it was in the list), recreate the buffer by reopening the file. (ido-make-buffer-list): If virtual buffers are being used, call `ido-add-virtual-buffers-to-list' before the make list hook. (ido-virtual-buffers): New variable which contains a copy of the current contents of the `recentf-list', albeit pared down for the sake of speed, and with proper faces applied. (ido-add-virtual-buffers-to-list): Using the `recentf-list', create a list of "virtual buffers" to present to the user in addition to the currently open set. Note that this logic could get rather slow if that list is too large. With the default `recentf-max-saved-items' of 200, there is little speed penalty.
author jwiegley@gmail.com
date Sun, 04 Apr 2010 02:55:19 -0400
parents 14ff9accfbd3
children 5582106cddf0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
16010
4addc35d079b Clean up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 16009
diff changeset
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
e356f6701b9e Initial revision
Karl Berry <karl@gnu.org>
parents:
diff changeset
3 internationalization features.)
e356f6701b9e Initial revision
Karl Berry <karl@gnu.org>
parents:
diff changeset
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,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 106185
diff changeset
6 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
78335
655b84302874 Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents: 75348
diff changeset
7 Free Software Foundation, Inc.
1155
e356f6701b9e Initial revision
Karl Berry <karl@gnu.org>
parents:
diff changeset
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
a8fa7c632ee4 Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 61805
diff changeset
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
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105661
diff changeset
120 # include <setjmp.h>
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
121 # include "lisp.h"
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
122 # include "buffer.h"
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
123
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
124 /* Make syntax table lookup grant data in gl_state. */
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
125 # define SYNTAX_ENTRY_VIA_PROPERTY
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
126
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
127 # include "syntax.h"
88387
06da178fab0e * regex.c: Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 40650
diff changeset
128 # 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
129 # include "category.h"
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
130
37705
a8725acacca5 (malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents: 35533
diff changeset
131 # ifdef malloc
a8725acacca5 (malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents: 35533
diff changeset
132 # undef malloc
a8725acacca5 (malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents: 35533
diff changeset
133 # endif
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
134 # define malloc xmalloc
37705
a8725acacca5 (malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents: 35533
diff changeset
135 # ifdef realloc
a8725acacca5 (malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents: 35533
diff changeset
136 # undef realloc
a8725acacca5 (malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents: 35533
diff changeset
137 # endif
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
138 # define realloc xrealloc
37705
a8725acacca5 (malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents: 35533
diff changeset
139 # ifdef free
a8725acacca5 (malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents: 35533
diff changeset
140 # undef free
a8725acacca5 (malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents: 35533
diff changeset
141 # endif
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
142 # define free xfree
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
143
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
144 /* 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
145 # define PTR_TO_OFFSET(d) POS_AS_IN_BUFFER (POINTER_TO_OFFSET (d))
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
146 # define POS_AS_IN_BUFFER(p) ((p) + (NILP (re_match_object) || BUFFERP (re_match_object)))
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
147
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
148 # define RE_MULTIBYTE_P(bufp) ((bufp)->multibyte)
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
149 # define RE_TARGET_MULTIBYTE_P(bufp) ((bufp)->target_multibyte)
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
150 # define RE_STRING_CHAR(p, multibyte) \
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
151 (multibyte ? (STRING_CHAR (p)) : (*(p)))
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
152 # define RE_STRING_CHAR_AND_LENGTH(p, len, multibyte) \
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
153 (multibyte ? (STRING_CHAR_AND_LENGTH (p, len)) : ((len) = 1, *(p)))
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
154
105661
bac26aa40069 Remove leftover table unibyte_to_multibyte_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105426
diff changeset
155 # define RE_CHAR_TO_MULTIBYTE(c) UNIBYTE_TO_CHAR (c)
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
156
95856
f13a77e0e34f * character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95479
diff changeset
157 # define RE_CHAR_TO_UNIBYTE(c) CHAR_TO_BYTE_SAFE (c)
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
158
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
159 /* 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
160 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
161 (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
162 # 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
163 do { \
90764
324e371fbbe5 (GET_CHAR_BEFORE_2, GET_CHAR_AFTER): Check the variable
Kenichi Handa <handa@m17n.org>
parents: 90757
diff changeset
164 if (target_multibyte) \
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
165 { \
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
166 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
167 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
168 while (dtemp-- > dlimit && !CHAR_HEAD_P (*dtemp)); \
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
169 c = STRING_CHAR (dtemp); \
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
170 } \
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
171 else \
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 (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
174 (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
175 } \
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
176 } while (0)
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
177
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
178 /* 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
179 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
180 # define GET_CHAR_AFTER(c, p, len) \
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
181 do { \
90764
324e371fbbe5 (GET_CHAR_BEFORE_2, GET_CHAR_AFTER): Check the variable
Kenichi Handa <handa@m17n.org>
parents: 90757
diff changeset
182 if (target_multibyte) \
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
183 (c) = STRING_CHAR_AND_LENGTH (p, len); \
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
184 else \
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
185 { \
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
186 (c) = *p; \
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
187 len = 1; \
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
188 (c) = RE_CHAR_TO_MULTIBYTE (c); \
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
189 } \
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
190 } while (0)
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
191
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
192 #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
193
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 /* 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
195 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
196 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
197 # undef REL_ALLOC
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
198
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
199 # 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
200 # include <stdlib.h>
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
201 # 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
202 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
203 char *realloc ();
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
204 # 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
205
69038
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
206 /* 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
207
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
208 void *
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
209 xmalloc (size)
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
210 size_t size;
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
211 {
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
212 register void *val;
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
213 val = (void *) malloc (size);
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
214 if (!val && size)
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
215 {
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
216 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
217 exit (1);
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
218 }
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
219 return val;
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
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
222 void *
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
223 xrealloc (block, size)
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
224 void *block;
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
225 size_t size;
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
226 {
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
227 register void *val;
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
228 /* 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
229 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
230 if (! block)
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
231 val = (void *) malloc (size);
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
232 else
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
233 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
234 if (!val && size)
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
235 {
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
236 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
237 exit (1);
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
238 }
b2288bb7d88f * regex.c (xmalloc, xrealloc): Define these when not linked to
Chong Yidong <cyd@stupidchicken.com>
parents: 69032
diff changeset
239 return val;
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
69039
f717c65a39d7 * regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 69038
diff changeset
242 # ifdef malloc
f717c65a39d7 * regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 69038
diff changeset
243 # undef malloc
f717c65a39d7 * regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 69038
diff changeset
244 # endif
f717c65a39d7 * regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 69038
diff changeset
245 # define malloc xmalloc
f717c65a39d7 * regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 69038
diff changeset
246 # ifdef realloc
f717c65a39d7 * regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 69038
diff changeset
247 # undef realloc
f717c65a39d7 * regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 69038
diff changeset
248 # endif
f717c65a39d7 * regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 69038
diff changeset
249 # define realloc xrealloc
f717c65a39d7 * regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 69038
diff changeset
250
12065
094636c759bf Undefined INHIBIT_STRING_HEADER when we have no
Karl Heuer <kwzh@gnu.org>
parents: 11974
diff changeset
251 /* 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
252 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
253 # 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
254 # 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
255 # 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
256 # 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
257 # endif
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
258 # endif
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
259 # endif
12065
094636c759bf Undefined INHIBIT_STRING_HEADER when we have no
Karl Heuer <kwzh@gnu.org>
parents: 11974
diff changeset
260
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
261 /* 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
262 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
263 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
264 # 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
265 # 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
266 # include <string.h>
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
267 # ifndef bzero
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
268 # ifndef _LIBC
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
269 # 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
270 # else
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
271 # 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
272 # endif
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
273 # endif
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
274 # else
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
275 # include <strings.h>
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
276 # ifndef memcmp
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
277 # 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
278 # endif
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
279 # ifndef memcpy
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
280 # 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
281 # endif
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
282 # endif
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
283 # 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
284
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
285 /* 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
286
28279
24a23e27dac6 (enum syntaxcode): Provide default for non-Emacs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28268
diff changeset
287 /* 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
288 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
289
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
290 # 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
291
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
292 /* 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
293 # 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
294 # 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
295 # 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
296 # 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
297 # 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
298 # 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
299 # 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
300 # 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
301 # 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
302 # 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
303 # 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
304 # define PREV_CHAR_BOUNDARY(p, limit) ((p)--)
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
305 # define STRING_CHAR(p) (*(p))
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
306 # define RE_STRING_CHAR(p, multibyte) STRING_CHAR (p)
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
307 # define CHAR_STRING(c, s) (*(s) = (c), 1)
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
308 # define STRING_CHAR_AND_LENGTH(p, actual_len) ((actual_len) = 1, *(p))
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
309 # define RE_STRING_CHAR_AND_LENGTH(p, len, multibyte) STRING_CHAR_AND_LENGTH (p, len)
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
310 # 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
311 # 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
312 # 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
313 (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
314 # define GET_CHAR_AFTER(c, p, len) \
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
315 (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
316 # 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
317 # 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
318 # 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
319 # define CHAR_LEADING_CODE(c) (c)
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
320
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
321 #endif /* not emacs */
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
322
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
323 #ifndef RE_TRANSLATE
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
324 # 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
325 # 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
326 #endif
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
327
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
328 /* 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
329 #include "regex.h"
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
330
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
331 /* 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
332 #include <ctype.h>
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 #ifdef emacs
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
335
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
336 /* 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
337 # 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
338
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
339 /* 1 if C is a unibyte character. */
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
340 # 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
341
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
342 /* 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
343
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
344 /* 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
345 # 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
346 # 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
347 # 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
348 || ((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
349 || ((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
350
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
351 /* 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
352 # 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
353
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
354 /* 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
355
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
356 # 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
357 ? (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
358 : 1)
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
359
31360
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
360 # 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
361 ? (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
362 : 1)
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
363
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
364 # 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
365 ? (((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
366 || ((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
367 || ((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
368 : SYNTAX (c) == Sword)
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 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
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 : SYNTAX (c) == Sword)
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
374
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
375 # 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
376
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
377 # 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
378 ? ((c) > ' ' && (c) < 0177 \
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
379 && !(((c) >= 'a' && (c) <= 'z') \
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
380 || ((c) >= 'A' && (c) <= 'Z') \
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
381 || ((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
382 : SYNTAX (c) != Sword)
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
383
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
384 # 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
385
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
386 # 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
387
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
388 # 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
389
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
390 #else /* not emacs */
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 /* Jim Meyering writes:
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 "... 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
395 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
396 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
397 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
398 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
399 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
400 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
401 eliminate the && through constant folding."
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
402 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
403
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
404 # undef ISASCII
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
405 # 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
406 # 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
407 # else
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
408 # 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
409 # endif
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
410
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
411 /* 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
412 # 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
413
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
414 /* 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
415 # 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
416
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
417 # ifdef isblank
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
418 # 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
419 # else
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
420 # 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
421 # endif
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
422 # ifdef isgraph
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
423 # 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
424 # else
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
425 # 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
426 # endif
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
427
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
428 # undef ISPRINT
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
429 # 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
430 # 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
431 # 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
432 # 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
433 # 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
434 # 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
435 # 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
436 # 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
437 # 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
438 # 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
439
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
440 # 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
441
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
442 # ifdef _tolower
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
443 # define TOLOWER(c) _tolower(c)
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
444 # else
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
445 # define TOLOWER(c) tolower(c)
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
446 # endif
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
447
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
448 /* 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
449 # define CHAR_SET_SIZE 256
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
450
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
451 # 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
452
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
453 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
454
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
455 # 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
456
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
457 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
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 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
460 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
461 {
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 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
463 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
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 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
466 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
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 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
469
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
470 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
471 if (ISALNUM (c))
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
472 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
473
55690
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
474 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
475
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
476 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
477 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
478
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
479 # endif /* not SYNTAX_TABLE */
25440
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
480
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
481 # 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
482
25440
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
483 #endif /* not emacs */
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
484
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
485 #ifndef NULL
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
486 # 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
487 #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
488
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
489 /* 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
490 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
491 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
492 (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
493 #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
494 #if __STDC__
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
495 # 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
496 #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
497 /* 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
498 # 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
499 #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
500
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
501 /* 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
502 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
503 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
504 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
505 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
506
11864
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 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
508 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
509 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
510
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
511 #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
512
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
513 # 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
514 # 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
515 # 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
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 #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
518
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
519 /* 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
520 # 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
521
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
522 /* 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
523 # ifdef __GNUC__
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
524 # 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
525 # else /* not __GNUC__ */
89071
c49c3ca273ba Use `ifdef HAVE_ALLOCA_H', not `if HAVE_ALLOCA_H'.
Dave Love <fx@gnu.org>
parents: 89061
diff changeset
526 # 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
527 # include <alloca.h>
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
528 # 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
529 # endif /* not __GNUC__ */
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
530
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
531 # endif /* not alloca */
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
532
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
533 # 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
534
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
535 /* 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
536 # 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
537 (destination = (char *) alloca (nsize), \
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
538 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
539
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 /* 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
541 # 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
542
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 #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
544
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 /* 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
546
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
547 #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
548
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
549 # 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
550 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
551 # 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
552 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
553 # 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
554 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
555
12478
533b6d02cf04 Don't use relocatable allocator.
Richard M. Stallman <rms@gnu.org>
parents: 12331
diff changeset
556 #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
557
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
558 # ifdef REGEX_MALLOC
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
559
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
560 # 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
561 # 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
562 # 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
563
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
564 # 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
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 alloca
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
567
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
568 # 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
569 REGEX_REALLOCATE (source, osize, nsize)
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
570 /* 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
571 # 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
572
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
573 # endif /* not REGEX_MALLOC */
12478
533b6d02cf04 Don't use relocatable allocator.
Richard M. Stallman <rms@gnu.org>
parents: 12331
diff changeset
574 #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
575
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
576
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
577 /* 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
578 `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
579 a good thing. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
580 #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
581 (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
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 /* (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
584 #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
585 #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
586 #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
587 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
588 #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
589
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
590 #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
591
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 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
593
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 #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
595 #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
596 #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
597 #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
598
65817
251409bdae6a (re_char): Move it back to the implementation file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65764
diff changeset
599 /* 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
600 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
601
11864
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 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
603 #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
604 #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
605
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
606 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
607 re_char *string1, int size1,
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
608 re_char *string2, int size2,
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
609 int pos,
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
610 struct re_registers *regs,
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
611 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
612
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
613 /* 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
614 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
615 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
616 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
617
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 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
619 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
620 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
621
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
622 /* 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
623 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
624
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
625 /* 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
626 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
627
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
628 /* 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
629 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
630
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
631 /* Matches any one char belonging to specified set. First
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
632 following byte is number of bitmap bytes. Then come bytes
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
633 for a bitmap saying which chars are in. Bits in each byte
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
634 are ordered low-bit-first. A character is in the set if its
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
635 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
636 automatically not in the set.
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
637
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
638 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
639 is followed by a range table:
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
640 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
641 See RANGE_TABLE_WORK_BITS below.
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
642 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
643 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
644 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
645 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
646
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
647 /* 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
648 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
649 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
650
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
651 /* Start remembering the text that is matched, for storing in a
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
652 register. Followed by one byte with the register number, in
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
653 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
654 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
655 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
656
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
657 /* Stop remembering the text that is matched and store it in a
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
658 memory register. Followed by one byte with the register
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
659 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
660 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
661 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
662
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
663 /* 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
664 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
665 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
666
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
667 /* 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
668 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
669
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
670 /* 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
671 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
672
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
673 /* Succeeds if at beginning of buffer (if emacs) or at beginning
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
674 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
675 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
676
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
677 /* 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
678 endbuf,
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
679
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
680 /* 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
681 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
682
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
683 /* 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
684 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
685 on_failure_jump,
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
686
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
687 /* Like on_failure_jump, but pushes a placeholder instead of the
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
688 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
689 on_failure_keep_string_jump,
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
690
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
691 /* 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
692 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
693 indefinitely). */
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
694 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
695
28342
9761cf2351fa (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28279
diff changeset
696 /* 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
697 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
698 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
699 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
700 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
701
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
702 /* 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
703 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
704 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
705 `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
706 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
707 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
708 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
709
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
710 /* 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
711 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
712 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
713 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
714 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
715
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
716 /* Followed by two-byte relative address, and two-byte number n.
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
717 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
718 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
719
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
720 /* Set the following two-byte relative address to the
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
721 subsequent two-byte number. The address *includes* the two
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
722 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
723 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
724
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 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
726 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
727
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
728 wordbound, /* Succeeds if at a word boundary. */
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
729 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
730
55690
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
731 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
732 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
733
11864
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 /* Matches any character whose syntax is specified. Followed by
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
735 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
736 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
737
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
738 /* 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
739 notsyntaxspec
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
740
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
741 #ifdef emacs
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
742 ,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
743 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
744 after_dot, /* Succeeds if after point. */
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
745
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
746 /* Matches any character whose category-set contains the specified
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
747 category. The operator is followed by a byte which contains a
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
748 category code (mnemonic ASCII character). */
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
749 categoryspec,
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
750
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
751 /* 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
752 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
753 contains the category code (mnemonic ASCII character). */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
754 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
755 #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
756 } 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
757
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
758 /* 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
759
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
760 /* 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
761
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 #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
763 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
764 (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
765 (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
766 } 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
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 /* 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
769 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
770 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
771
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 #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
773 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
774 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
775 (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
776 } 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
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 /* 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
779 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
780
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 #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
782 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
783 (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
784 (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
785 } 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
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 #ifdef DEBUG
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
788 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
789 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
790 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
791 int *dest;
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
792 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
793 {
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
794 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
795 *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
796 *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
797 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
798
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
799 # 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
800 # undef EXTRACT_NUMBER
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
801 # 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
802 # 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
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 #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
805
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
806 /* 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
807 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
808
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 #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
810 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
811 EXTRACT_NUMBER (destination, source); \
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
812 (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
813 } 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
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 #ifdef DEBUG
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
816 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
817 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
818 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
819 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
820 int *destination;
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
821 re_char **source;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
822 {
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
823 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
824 *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
825 }
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
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
827 # ifndef EXTRACT_MACROS
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
828 # 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
829 # 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
830 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
831 # 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
832
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
833 #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
834
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
835 /* 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
836 DESTINATION, and increment DESTINATION to the byte after where the
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
837 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
838
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
839 #define STORE_CHARACTER_AND_INCR(destination, character) \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
840 do { \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
841 (destination)[0] = (character) & 0377; \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
842 (destination)[1] = ((character) >> 8) & 0377; \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
843 (destination)[2] = (character) >> 16; \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
844 (destination) += 3; \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
845 } while (0)
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
846
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
847 /* Put into DESTINATION a character stored in three contiguous bytes
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
848 starting at SOURCE. */
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
849
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
850 #define EXTRACT_CHARACTER(destination, source) \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
851 do { \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
852 (destination) = ((source)[0] \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
853 | ((source)[1] << 8) \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
854 | ((source)[2] << 16)); \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
855 } while (0)
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
856
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
857
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
858 /* Macros for charset. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
859
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
860 /* 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
861 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
862 #define CHARSET_BITMAP_SIZE(p) ((p)[1] & 0x7F)
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 /* Nonzero if charset P has range table. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
865 #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
866
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
867 /* 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
868 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
869 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
870 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
871 #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
872
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
873 /* 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
874 #define CHARSET_RANGE_TABLE_BITS(p) \
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
875 ((p)[2 + CHARSET_BITMAP_SIZE (p)] \
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
876 + (p)[3 + CHARSET_BITMAP_SIZE (p)] * 0x100)
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
877
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
878 /* 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
879 #define CHARSET_LOOKUP_BITMAP(p, c) \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
880 ((c) < CHARSET_BITMAP_SIZE (p) * BYTEWIDTH \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
881 && (p)[2 + (c) / BYTEWIDTH] & (1 << ((c) % BYTEWIDTH)))
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
882
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
883 /* 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
884 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
885 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
886 and end. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
887 #define CHARSET_RANGE_TABLE_END(range_table, count) \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
888 ((range_table) + (count) * 2 * 3)
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
889
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
890 /* 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
891 COUNT is number of ranges in RANGE_TABLE. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
892 #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
893 do \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
894 { \
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
895 re_wchar_t range_start, range_end; \
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
896 re_char *p; \
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
897 re_char *range_table_end \
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
898 = CHARSET_RANGE_TABLE_END ((range_table), (count)); \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
899 \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
900 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
901 { \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
902 EXTRACT_CHARACTER (range_start, p); \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
903 EXTRACT_CHARACTER (range_end, p + 3); \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
904 \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
905 if (range_start <= (c) && (c) <= range_end) \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
906 { \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
907 (not) = !(not); \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
908 break; \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
909 } \
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 } \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
912 while (0)
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
913
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
914 /* 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
915 C is listed in it. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
916 #define CHARSET_LOOKUP_RANGE_TABLE(not, c, charset) \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
917 do \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
918 { \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
919 /* Number of ranges in range table. */ \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
920 int count; \
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
921 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
922 \
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
923 EXTRACT_NUMBER_AND_INCR (count, range_table); \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
924 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
925 } \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
926 while (0)
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
927
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
928 /* 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
929 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
930 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
931 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
932 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
933
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
934 #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
935
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 /* 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
937 # 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
938
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 /* 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
940 # 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
941
28163
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
942 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
943
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
944 # 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
945 # 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
946 # 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
947 # 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
948 # 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
949 # 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
950 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
951 # 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
952 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
953
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
954
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
955 /* 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
956
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
957 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
958 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
959 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
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 unsigned was_a_range = 0;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
962 unsigned i = 0;
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
963
11864
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 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
965 {
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 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
967 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
968 was_a_range = 0;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
969 putchar (i - 1);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
970 while (i < (1 << BYTEWIDTH) && fastmap[i])
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
971 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
972 was_a_range = 1;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
973 i++;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
974 }
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
975 if (was_a_range)
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
976 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
977 printf ("-");
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
978 putchar (i - 1);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
979 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
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 }
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
982 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
983 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
984
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
985
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
986 /* 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
987 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
988
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 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
990 print_partial_compiled_pattern (start, end)
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
991 re_char *start;
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
992 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
993 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
994 int mcnt, mcnt2;
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
995 re_char *p = start;
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
996 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
997
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
998 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
999 {
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1000 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
1001 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
1002 }
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1003
11864
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 /* 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
1005 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
1006 {
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1007 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
1008
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1009 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
1010 {
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1011 case no_op:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1012 fprintf (stderr, "/no_op");
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1013 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
1014
28163
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
1015 case succeed:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1016 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
1017 break;
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
1018
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1019 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
1020 mcnt = *p++;
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1021 fprintf (stderr, "/exactn/%d", mcnt);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1022 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
1023 {
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1024 fprintf (stderr, "/%c", *p++);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1025 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1026 while (--mcnt);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1027 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
1028
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 case start_memory:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1030 fprintf (stderr, "/start_memory/%d", *p++);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1031 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
1032
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1033 case stop_memory:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1034 fprintf (stderr, "/stop_memory/%d", *p++);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1035 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
1036
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1037 case duplicate:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1038 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
1039 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
1040
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1041 case anychar:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1042 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
1043 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
1044
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 case charset:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1046 case charset_not:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1047 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1048 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
1049 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
1050 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
1051 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
1052
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1053 fprintf (stderr, "/charset [%s",
52838
246c94760bee (MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents: 52680
diff changeset
1054 (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
1055
246c94760bee (MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents: 52680
diff changeset
1056 if (p + *p >= pend)
246c94760bee (MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents: 52680
diff changeset
1057 fprintf (stderr, " !extends past end of pattern! ");
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1058
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1059 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
1060 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
1061 && (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
1062 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1063 /* 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
1064 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
1065 {
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1066 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
1067 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
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 /* 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
1070 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
1071 {
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1072 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
1073 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
1074 }
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1075
11864
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 if (! in_range)
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1077 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
1078
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 last = c;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1080 }
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1081
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", last);
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1084
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1085 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
1086
28163
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
1087 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
1088
25440
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
1089 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
1090 {
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
1091 int count;
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1092 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
1093
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
1094 /* ??? 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
1095 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
1096 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
1097 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
1098 }
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1099 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1100 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
1101
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1102 case begline:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1103 fprintf (stderr, "/begline");
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1104 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
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 case endline:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1107 fprintf (stderr, "/endline");
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1108 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
1109
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1110 case on_failure_jump:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1111 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
1112 fprintf (stderr, "/on_failure_jump to %d", p + mcnt - start);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1113 break;
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1114
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1115 case on_failure_keep_string_jump:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1116 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
1117 fprintf (stderr, "/on_failure_keep_string_jump to %d", p + mcnt - start);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1118 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
1119
28342
9761cf2351fa (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28279
diff changeset
1120 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
1121 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
1122 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
1123 break;
9761cf2351fa (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28279
diff changeset
1124
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1125 case on_failure_jump_loop:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1126 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
1127 fprintf (stderr, "/on_failure_jump_loop to %d", p + mcnt - start);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1128 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1129
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1130 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
1131 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
1132 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
1133 break;
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1134
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1135 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
1136 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
1137 fprintf (stderr, "/jump to %d", p + mcnt - start);
16010
4addc35d079b Clean up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 16009
diff changeset
1138 break;
4addc35d079b Clean up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 16009
diff changeset
1139
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1140 case succeed_n:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1141 extract_number_and_incr (&mcnt, &p);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1142 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
1143 fprintf (stderr, "/succeed_n to %d, %d times", p - 2 + mcnt - start, mcnt2);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1144 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1145
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1146 case jump_n:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1147 extract_number_and_incr (&mcnt, &p);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
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, "/jump_n to %d, %d times", p - 2 + mcnt - start, mcnt2);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1150 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1151
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1152 case set_number_at:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1153 extract_number_and_incr (&mcnt, &p);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
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, "/set_number_at location %d to %d", p - 2 + mcnt - start, mcnt2);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1156 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1157
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1158 case wordbound:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1159 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
1160 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
1161
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1162 case notwordbound:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1163 fprintf (stderr, "/notwordbound");
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1164 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
1165
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 case wordbeg:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1167 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
1168 break;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1169
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1170 case wordend:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1171 fprintf (stderr, "/wordend");
55811
d8ee27fc17e9 (print_partial_compiled_pattern): Add missing 'break'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55690
diff changeset
1172 break;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1173
55690
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
1174 case symbeg:
55811
d8ee27fc17e9 (print_partial_compiled_pattern): Add missing 'break'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55690
diff changeset
1175 fprintf (stderr, "/symbeg");
55690
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
1176 break;
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
1177
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
1178 case symend:
55811
d8ee27fc17e9 (print_partial_compiled_pattern): Add missing 'break'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55690
diff changeset
1179 fprintf (stderr, "/symend");
55690
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
1180 break;
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
1181
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
1182 case syntaxspec:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1183 fprintf (stderr, "/syntaxspec");
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
1184 mcnt = *p++;
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1185 fprintf (stderr, "/%d", mcnt);
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
1186 break;
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
1187
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
1188 case notsyntaxspec:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1189 fprintf (stderr, "/notsyntaxspec");
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
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
1194 # 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
1195 case before_dot:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1196 fprintf (stderr, "/before_dot");
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1197 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
1198
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1199 case at_dot:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1200 fprintf (stderr, "/at_dot");
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1201 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
1202
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1203 case after_dot:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1204 fprintf (stderr, "/after_dot");
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1205 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
1206
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
1207 case categoryspec:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1208 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
1209 mcnt = *p++;
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1210 fprintf (stderr, "/%d", mcnt);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1211 break;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
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 notcategoryspec:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1214 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
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);
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1217 break;
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
1218 # 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
1219
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1220 case begbuf:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1221 fprintf (stderr, "/begbuf");
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1222 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
1223
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1224 case endbuf:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1225 fprintf (stderr, "/endbuf");
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1226 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1227
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1228 default:
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1229 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
1230 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1231
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1232 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
1233 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1234
49930
0f71486df5bc (print_partial_compiled_pattern): Output to stderr.
Richard M. Stallman <rms@gnu.org>
parents: 49600
diff changeset
1235 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
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
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1238
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 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
1240 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
1241 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
1242 {
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
1243 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
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 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
1246 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
1247 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
1248
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1249 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
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 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
1252 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
1253 }
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 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
1256 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
1257 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
1258 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
1259 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
1260 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
1261 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
1262 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
1263 /* 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
1264 }
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
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
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1267 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
1268 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
1269 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
1270 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
1271 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
1272 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
1273 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
1274 {
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1275 int this_char;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1276
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1277 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
1278 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
1279 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
1280 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1281 if (FIRST_STRING_P (where))
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1282 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1283 for (this_char = where - string1; this_char < size1; this_char++)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1284 putchar (string1[this_char]);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1285
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1286 where = string2;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1287 }
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1288
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1289 for (this_char = where - string2; this_char < size2; this_char++)
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1290 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
1291 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1292 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1293
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 #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
1295
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
1296 # undef assert
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
1297 # define assert(e)
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
1298
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
1299 # 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
1300 # 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
1301 # 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
1302 # 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
1303 # 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
1304 # 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
1305 # 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
1306
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1307 #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
1308
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1309 /* 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
1310 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
1311 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
1312 /* 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
1313 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
1314 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
1315
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
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 /* 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
1318 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
1319 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
1320
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 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
1322 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
1323
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 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
1325 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
1326 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
1327 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1328 reg_syntax_t ret = re_syntax_options;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1329
11864
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 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
1331 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
1332 }
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
1333 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
1334
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
1335 /* 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
1336 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
1337
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
1338 void
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
1339 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
1340 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
1341 {
65817
251409bdae6a (re_char): Move it back to the implementation file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65764
diff changeset
1342 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
1343 }
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
1344 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
1345
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1346 /* 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
1347 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
1348 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
1349 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
1350
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1351 static const char *re_error_msgid[] =
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1352 {
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1353 gettext_noop ("Success"), /* REG_NOERROR */
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1354 gettext_noop ("No match"), /* REG_NOMATCH */
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1355 gettext_noop ("Invalid regular expression"), /* REG_BADPAT */
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1356 gettext_noop ("Invalid collation character"), /* REG_ECOLLATE */
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1357 gettext_noop ("Invalid character class name"), /* REG_ECTYPE */
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1358 gettext_noop ("Trailing backslash"), /* REG_EESCAPE */
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1359 gettext_noop ("Invalid back reference"), /* REG_ESUBREG */
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1360 gettext_noop ("Unmatched [ or [^"), /* REG_EBRACK */
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1361 gettext_noop ("Unmatched ( or \\("), /* REG_EPAREN */
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1362 gettext_noop ("Unmatched \\{"), /* REG_EBRACE */
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1363 gettext_noop ("Invalid content of \\{\\}"), /* REG_BADBR */
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1364 gettext_noop ("Invalid range end"), /* REG_ERANGE */
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1365 gettext_noop ("Memory exhausted"), /* REG_ESPACE */
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1366 gettext_noop ("Invalid preceding regular expression"), /* REG_BADRPT */
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1367 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
1368 gettext_noop ("Regular expression too big"), /* REG_ESIZE */
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1369 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
1370 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
1371 };
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1372
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1373 /* 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
1374
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1375 /* 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
1376 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
1377 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
1378 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
1379 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
1380 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
1381 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
1382
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1383 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
1384 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
1385 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
1386 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
1387 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
1388 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
1389 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
1390 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
1391
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1392 /* 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
1393 #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
1394
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 /* 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
1396 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
1397 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
1398 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
1399 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
1400 #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
1401 # 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
1402 #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
1403
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
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1405 /* 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
1406 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
1407 REGEX_ALLOCATE_STACK. */
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1408
11864
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
20449
fc965930c738 (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 19184
diff changeset
1410 /* 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
1411 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
1412 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
1413 #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
1414 # 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
1415 #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
1416
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 /* 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
1418 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
1419 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
1420 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
1421 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
1422 # 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
1423 /* 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
1424 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
1425 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
1426 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
1427 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
1428 # else
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
1429 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
1430 # 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
1431
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1432 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
1433 {
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
1434 re_char *pointer;
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
1435 /* 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
1436 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
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
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 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
1440
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1441 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
1442 {
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 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
1444 size_t size;
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
1445 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
1446 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
1447 } 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
1448
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1449 #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
1450 #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
1451
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1452
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 /* 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
1454 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
1455
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 #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
1457 # 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
1458 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
1459 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
1460 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
1461 * 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
1462 \
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1463 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
1464 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
1465 \
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1466 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
1467 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
1468 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
1469 } 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
1470
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
1471 # 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
1472 #else
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
1473 # 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
1474 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
1475 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
1476 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
1477 } 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
1478
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
1479 # 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
1480 #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
1481
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1482
20449
fc965930c738 (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 19184
diff changeset
1483 /* 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
1484 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
1485
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 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
1487 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
1488
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1489 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
1490
20449
fc965930c738 (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 19184
diff changeset
1491 /* 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
1492 when we increase it.
fc965930c738 (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 19184
diff changeset
1493 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
1494 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
1495 were as ultimate, maximum-size stack. */
fc965930c738 (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 19184
diff changeset
1496 #define FAIL_STACK_GROWTH_FACTOR 4
fc965930c738 (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 19184
diff changeset
1497
fc965930c738 (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 19184
diff changeset
1498 #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
1499 (((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
1500 >= 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
1501 ? 0 \
20449
fc965930c738 (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 19184
diff changeset
1502 : ((fail_stack).stack \
fc965930c738 (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 19184
diff changeset
1503 = (fail_stack_elt_t *) \
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1504 REGEX_REALLOCATE_STACK ((fail_stack).stack, \
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1505 (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
1506 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
1507 ((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
1508 * 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
1509 \
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1510 (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
1511 ? 0 \
20450
8f05356e9dc3 (GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents: 20449
diff changeset
1512 : ((fail_stack).size \
8f05356e9dc3 (GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents: 20449
diff changeset
1513 = (MIN (re_max_failures * TYPICAL_FAILURE_SIZE, \
8f05356e9dc3 (GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents: 20449
diff changeset
1514 ((fail_stack).size * sizeof (fail_stack_elt_t) \
8f05356e9dc3 (GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents: 20449
diff changeset
1515 * FAIL_STACK_GROWTH_FACTOR)) \
8f05356e9dc3 (GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents: 20449
diff changeset
1516 / sizeof (fail_stack_elt_t)), \
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1517 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
1518
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1519
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1520 /* 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
1521 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
1522 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
1523 #define PUSH_FAILURE_POINTER(item) \
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
1524 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
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 /* 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
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_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
1530 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
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 /* 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
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_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
1536 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
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 /* 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
1539 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
1540 #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
1541 #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
1542 #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
1543
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1544 /* 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
1545 #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
1546
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1547 /* 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
1548 #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
1549 #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
1550 #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
1551 #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
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
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 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
1555 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
1556 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
1557 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
1558 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
1559 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
1560 }
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1561
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1562 /* 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
1563 #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
1564 do { \
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1565 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
1566 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
1567 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
1568 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
1569 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
1570 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
1571 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
1572 } 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
1573
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
1574 /* 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
1575 be reset when backtracking. */
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
1576 #define PUSH_NUMBER(ptr,val) \
31172
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1577 do { \
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1578 char *destination; \
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1579 int c; \
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1580 ENSURE_FAIL_STACK(3); \
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1581 EXTRACT_NUMBER (c, ptr); \
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
1582 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
1583 PUSH_FAILURE_INT (c); \
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1584 PUSH_FAILURE_POINTER (ptr); \
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1585 PUSH_FAILURE_INT (-1); \
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
1586 STORE_NUMBER (ptr, val); \
31172
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1587 } while (0)
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1588
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1589 /* Pop a saved register off the stack. */
31172
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1590 #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
1591 do { \
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1592 int reg = POP_FAILURE_INT (); \
31172
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1593 if (reg == -1) \
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1594 { \
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1595 /* 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
1596 /* 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
1597 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
1598 reg = POP_FAILURE_INT (); \
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1599 STORE_NUMBER (ptr, reg); \
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1600 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
1601 } \
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1602 else \
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1603 { \
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1604 regend[reg] = POP_FAILURE_POINTER (); \
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1605 regstart[reg] = POP_FAILURE_POINTER (); \
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1606 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
1607 reg, regstart[reg], regend[reg]); \
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1608 } \
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1609 } 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
1610
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1611 /* 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
1612 #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
1613 do { \
44063
fd6c1f8ebd4e (DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 40650
diff changeset
1614 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
1615 /* Check for infinite matching loops */ \
44063
fd6c1f8ebd4e (DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 40650
diff changeset
1616 while (failure > 0 \
fd6c1f8ebd4e (DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 40650
diff changeset
1617 && (FAILURE_STR (failure) == string_place \
fd6c1f8ebd4e (DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 40650
diff changeset
1618 || 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
1619 { \
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1620 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
1621 && 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
1622 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
1623 { \
47368
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
1624 cycle = 1; \
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
1625 break; \
44063
fd6c1f8ebd4e (DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 40650
diff changeset
1626 } \
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 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
1628 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
1629 } \
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1630 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
1631 } while (0)
47368
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
1632
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1633 /* 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
1634 if we ever fail back to it.
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1635
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1636 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
1637 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
1638 declared.
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1639
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1640 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
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 #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
1643 do { \
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1644 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
1645 /* 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
1646 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
1647 \
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1648 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
1649 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
1650 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
1651 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
1652 \
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1653 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
1654 \
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1655 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
1656 \
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 (" 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
1658 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
1659 \
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1660 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
1661 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
1662 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
1663 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
1664 \
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1665 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
1666 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
1667 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
1668 \
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1669 /* 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
1670 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
1671 } 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
1672
20449
fc965930c738 (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 19184
diff changeset
1673 /* 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
1674 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
1675 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
1676 /* 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
1677 #define TYPICAL_FAILURE_SIZE 20
fc965930c738 (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 19184
diff changeset
1678
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1679 /* 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
1680 #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
1681
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1682
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1683 /* 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
1684
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 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
1686 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
1687 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
1688 REGSTART, REGEND -- arrays of string positions.
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1689
11864
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 Also assumes the variables `fail_stack' and (if debugging), `bufp',
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
1691 `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
1692
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1693 #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
1694 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
1695 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
1696 \
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1697 /* 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
1698 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
1699 DEBUG_PRINT2 (" Before pop, next avail: %d\n", fail_stack.avail); \
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1700 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
1701 \
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1702 /* 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
1703 while (fail_stack.frame < fail_stack.avail) \
31172
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
1704 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
1705 \
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
1706 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
1707 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
1708 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
1709 \
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1710 /* 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
1711 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
1712 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
1713 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
1714 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
1715 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
1716 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
1717 \
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1718 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
1719 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
1720 \
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
1721 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
1722 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
1723 \
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1724 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
1725 } 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
1726
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1727
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1728
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1729 /* 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
1730 #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
1731
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1732 /* 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
1733
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1734 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
1735 reg_syntax_t syntax,
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1736 struct re_pattern_buffer *bufp));
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1737 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
1738 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
1739 int arg1, int arg2));
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1740 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
1741 int arg, unsigned char *end));
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1742 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
1743 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
1744 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
1745 re_char *p,
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1746 reg_syntax_t syntax));
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
1747 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
1748 re_char *pend,
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1749 reg_syntax_t syntax));
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
1750 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
1751 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
1752 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
1753
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1754 /* 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
1755 translation. */
47008
c299d527a088 (PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44145
diff changeset
1756 #define PATFETCH(c) \
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
1757 do { \
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
1758 int len; \
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
1759 if (p == pend) return REG_EEND; \
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
1760 c = RE_STRING_CHAR_AND_LENGTH (p, len, multibyte); \
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
1761 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
1762 } 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
1763
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1764
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1765 /* 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
1766 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
1767 `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
1768 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
1769 #ifndef TRANSLATE
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
1770 # 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
1771 (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
1772 #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
1773
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
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1775 /* 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
1776
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1777 /* 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
1778 #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
1779
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1780 /* 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
1781 #define GET_BUFFER_SPACE(n) \
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
1782 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
1783 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
1784
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 /* 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
1786 #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
1787 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
1788 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
1789 *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
1790 } 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
1791
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
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 /* 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
1794 #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
1795 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
1796 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
1797 *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
1798 *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
1799 } 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
1800
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
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1802 /* 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
1803 #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
1804 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
1805 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
1806 *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
1807 *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
1808 *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
1809 } while (0)
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1810
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1811
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1812 /* 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
1813 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
1814 #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
1815 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
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 /* 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
1818 #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
1819 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
1820
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1821 /* 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
1822 #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
1823 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
1824
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 /* 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
1826 #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
1827 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
1828
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1829
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 /* 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
1831 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
1832 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
1833 # define MAX_BUF_SIZE (1L << 15)
246c94760bee (MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents: 52680
diff changeset
1834
246c94760bee (MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents: 52680
diff changeset
1835 #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
1836 /* 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
1837 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
1838 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
1839 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
1840 You have been warned!! */
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1841 #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
1842 /* 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
1843 # define MAX_BUF_SIZE 65500L
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1844 #else
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1845 # 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
1846 #endif
52838
246c94760bee (MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents: 52680
diff changeset
1847 #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
1848
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1849 /* 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
1850 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
1851 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
1852 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
1853 #if __BOUNDED_POINTERS__
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1854 # define SET_HIGH_BOUND(P) (__ptrhigh (P) = __ptrlow (P) + bufp->allocated)
93266
6a347c175702 (EXTEND_BUFFER): Change order of pointer addition operations, to avoid
Chong Yidong <cyd@stupidchicken.com>
parents: 93033
diff changeset
1855 # define MOVE_BUFFER_POINTER(P) \
6a347c175702 (EXTEND_BUFFER): Change order of pointer addition operations, to avoid
Chong Yidong <cyd@stupidchicken.com>
parents: 93033
diff changeset
1856 (__ptrlow (P) = new_buffer + (__ptrlow (P) - old_buffer), \
6a347c175702 (EXTEND_BUFFER): Change order of pointer addition operations, to avoid
Chong Yidong <cyd@stupidchicken.com>
parents: 93033
diff changeset
1857 SET_HIGH_BOUND (P), \
6a347c175702 (EXTEND_BUFFER): Change order of pointer addition operations, to avoid
Chong Yidong <cyd@stupidchicken.com>
parents: 93033
diff changeset
1858 __ptrvalue (P) = new_buffer + (__ptrvalue (P) - old_buffer))
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1859 # 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
1860 else \
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1861 { \
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1862 SET_HIGH_BOUND (b); \
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1863 SET_HIGH_BOUND (begalt); \
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1864 if (fixup_alt_jump) \
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1865 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
1866 if (laststart) \
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1867 SET_HIGH_BOUND (laststart); \
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1868 if (pending_exact) \
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1869 SET_HIGH_BOUND (pending_exact); \
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1870 }
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1871 #else
93266
6a347c175702 (EXTEND_BUFFER): Change order of pointer addition operations, to avoid
Chong Yidong <cyd@stupidchicken.com>
parents: 93033
diff changeset
1872 # define MOVE_BUFFER_POINTER(P) ((P) = new_buffer + ((P) - old_buffer))
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1873 # 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
1874 #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
1875 #define EXTEND_BUFFER() \
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1876 do { \
93266
6a347c175702 (EXTEND_BUFFER): Change order of pointer addition operations, to avoid
Chong Yidong <cyd@stupidchicken.com>
parents: 93033
diff changeset
1877 unsigned char *old_buffer = bufp->buffer; \
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1878 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
1879 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
1880 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
1881 if (bufp->allocated > MAX_BUF_SIZE) \
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1882 bufp->allocated = MAX_BUF_SIZE; \
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
1883 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
1884 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
1885 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
1886 /* 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
1887 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
1888 { \
93266
6a347c175702 (EXTEND_BUFFER): Change order of pointer addition operations, to avoid
Chong Yidong <cyd@stupidchicken.com>
parents: 93033
diff changeset
1889 unsigned char *new_buffer = bufp->buffer; \
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1890 MOVE_BUFFER_POINTER (b); \
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1891 MOVE_BUFFER_POINTER (begalt); \
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1892 if (fixup_alt_jump) \
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1893 MOVE_BUFFER_POINTER (fixup_alt_jump); \
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1894 if (laststart) \
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1895 MOVE_BUFFER_POINTER (laststart); \
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
1896 if (pending_exact) \
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1897 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
1898 } \
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1899 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
1900 } 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
1901
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
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1903 /* 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
1904 {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
1905 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
1906 #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
1907
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 /* 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
1909 ignore the excess. */
47337
a4b9dff21d74 (regnum_t): Use signed int, not unsigned int.
Richard M. Stallman <rms@gnu.org>
parents: 47250
diff changeset
1910 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
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
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 /* 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
1914
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 /* 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
1916 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
1917 /* 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
1918 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
1919
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1920 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
1921 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1922 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
1923 pattern_offset_t fixup_alt_jump;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
1924 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
1925 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
1926 } 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
1927
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
1928
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 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
1930 {
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 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
1932 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
1933 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
1934 } 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
1935
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
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 #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
1938
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 #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
1940 #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
1941
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
1942 /* 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
1943 #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
1944
68371
05d6eb9afa08 (IMMEDIATE_QUIT_CHECK): Use it with SYNC_INPUT as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65817
diff changeset
1945 /* 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
1946 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
1947 #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
1948 extern int immediate_quit;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
1949 # define IMMEDIATE_QUIT_CHECK \
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
1950 do { \
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
1951 if (immediate_quit) QUIT; \
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
1952 } while (0)
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
1953 #else
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
1954 # define IMMEDIATE_QUIT_CHECK ((void)0)
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
1955 #endif
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
1956
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
1957 /* Structure to manage work area for range table. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
1958 struct range_table_work_area
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
1959 {
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
1960 int *table; /* actual work area. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
1961 int allocated; /* allocated size for work area in bytes. */
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
1962 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
1963 int bits; /* flag to record character classes */
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
1964 };
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
1965
47233
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
1966 /* 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
1967 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
1968 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
1969 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
1970
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
1971 #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
1972 do { \
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
1973 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
1974 { \
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
1975 extend_range_table_work_area (&work_area); \
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
1976 if ((work_area).table == 0) \
47233
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
1977 return (REG_ESPACE); \
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
1978 } \
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
1979 } while (0)
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
1980
25440
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
1981 #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
1982 (work_area).bits |= (bit)
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
1983
31360
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
1984 /* 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
1985 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
1986 #define BIT_WORD 0x1
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
1987 #define BIT_LOWER 0x2
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
1988 #define BIT_PUNCT 0x4
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
1989 #define BIT_SPACE 0x8
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
1990 #define BIT_UPPER 0x10
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
1991 #define BIT_MULTIBYTE 0x20
25440
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
1992
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
1993 /* 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
1994 #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
1995 do { \
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
1996 EXTEND_RANGE_TABLE ((work_area), 2); \
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
1997 (work_area).table[(work_area).used++] = (range_start); \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
1998 (work_area).table[(work_area).used++] = (range_end); \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
1999 } while (0)
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2000
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
2001 /* Free allocated memory for WORK_AREA. */
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2002 #define FREE_RANGE_TABLE_WORK_AREA(work_area) \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2003 do { \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2004 if ((work_area).table) \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2005 free ((work_area).table); \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2006 } while (0)
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2007
25440
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
2008 #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
2009 #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
2010 #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
2011 #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
2012
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2013
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2014 /* 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
2015 #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
2016
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2017
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
2018 #ifdef emacs
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
2019
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2020 /* 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
2021 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
2022 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
2023 continuity of translated characters.
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2024
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2025 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
2026 macros by a function, but it's not that easy because macros called
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
2027 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
2028
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2029 /* 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
2030
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2031 #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
2032 do { \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2033 int C0, C1; \
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 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
2036 { \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2037 C1 = TRANSLATE (C0); \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2038 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
2039 { \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2040 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
2041 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
2042 C1 = C0; \
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_LIST_BIT (C1); \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2045 } \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2046 } while (0)
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
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2049 /* 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
2050
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2051 #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
2052 do { \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2053 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
2054 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
2055 \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2056 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
2057 { \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2058 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
2059 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
2060 SET_LIST_BIT (C0); \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2061 else \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2062 { \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2063 C2 = TRANSLATE (C1); \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2064 if (C2 == C1 \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2065 || (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
2066 C1 = C0; \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2067 SET_LIST_BIT (C1); \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2068 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
2069 { \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2070 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
2071 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
2072 \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2073 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
2074 { \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2075 if (C2 == from - 1) \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2076 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
2077 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
2078 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
2079 break; \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2080 } \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2081 } \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2082 if (I < USED) \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2083 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
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 } while (0)
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2087
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 /* 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
2090
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2091 #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
2092 do { \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2093 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
2094 \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2095 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
2096 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
2097 { \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2098 C1 = TRANSLATE (C0); \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2099 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
2100 || (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
2101 SET_LIST_BIT (C2); \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2102 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
2103 continue; \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2104 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
2105 { \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2106 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
2107 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
2108 \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2109 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
2110 { \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2111 if (C1 == from - 1) \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2112 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
2113 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
2114 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
2115 break; \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2116 } \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2117 } \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2118 if (I < USED) \
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2119 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
2120 } \
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
2121 } while (0)
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
2122
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
2123 #endif /* emacs */
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
2124
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2125 /* Get the next unsigned number in the uncompiled pattern. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2126 #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
2127 do { \
5f1c0193e984 (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58780
diff changeset
2128 if (p == pend) \
5f1c0193e984 (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58780
diff changeset
2129 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
2130 else \
5f1c0193e984 (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58780
diff changeset
2131 { \
5f1c0193e984 (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58780
diff changeset
2132 PATFETCH (c); \
5f1c0193e984 (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58780
diff changeset
2133 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
2134 { \
5f1c0193e984 (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58780
diff changeset
2135 int prev; \
5f1c0193e984 (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58780
diff changeset
2136 if (num < 0) \
5f1c0193e984 (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58780
diff changeset
2137 num = 0; \
5f1c0193e984 (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58780
diff changeset
2138 prev = num; \
5f1c0193e984 (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58780
diff changeset
2139 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
2140 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
2141 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
2142 if (p == pend) \
5f1c0193e984 (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58780
diff changeset
2143 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
2144 PATFETCH (c); \
5f1c0193e984 (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58780
diff changeset
2145 } \
5f1c0193e984 (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58780
diff changeset
2146 } \
5f1c0193e984 (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58780
diff changeset
2147 } while (0)
47233
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2148
56091
10b16f7f1a51 (re_wctype, re_iswctype): Function defs longer static.
Richard M. Stallman <rms@gnu.org>
parents: 55811
diff changeset
2149 #if ! WIDE_CHAR_SUPPORT
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
2150
31360
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2151 /* 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
2152 re_wctype_t
40650
ded4aa3c81b2 (re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39718
diff changeset
2153 re_wctype (str)
ded4aa3c81b2 (re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39718
diff changeset
2154 re_char *str;
31360
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2155 {
40650
ded4aa3c81b2 (re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39718
diff changeset
2156 const char *string = str;
31360
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2157 if (STREQ (string, "alnum")) return RECC_ALNUM;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2158 else if (STREQ (string, "alpha")) return RECC_ALPHA;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2159 else if (STREQ (string, "word")) return RECC_WORD;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2160 else if (STREQ (string, "ascii")) return RECC_ASCII;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2161 else if (STREQ (string, "nonascii")) return RECC_NONASCII;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2162 else if (STREQ (string, "graph")) return RECC_GRAPH;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2163 else if (STREQ (string, "lower")) return RECC_LOWER;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2164 else if (STREQ (string, "print")) return RECC_PRINT;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2165 else if (STREQ (string, "punct")) return RECC_PUNCT;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2166 else if (STREQ (string, "space")) return RECC_SPACE;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2167 else if (STREQ (string, "upper")) return RECC_UPPER;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2168 else if (STREQ (string, "unibyte")) return RECC_UNIBYTE;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2169 else if (STREQ (string, "multibyte")) return RECC_MULTIBYTE;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2170 else if (STREQ (string, "digit")) return RECC_DIGIT;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2171 else if (STREQ (string, "xdigit")) return RECC_XDIGIT;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2172 else if (STREQ (string, "cntrl")) return RECC_CNTRL;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2173 else if (STREQ (string, "blank")) return RECC_BLANK;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2174 else return 0;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2175 }
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2176
78501
1677cf1c2509 Replace `iff' in comments.
Glenn Morris <rgm@gnu.org>
parents: 78335
diff changeset
2177 /* 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
2178 boolean
31360
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2179 re_iswctype (ch, cc)
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2180 int ch;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2181 re_wctype_t cc;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2182 {
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2183 switch (cc)
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2184 {
33066
c782e22760e0 (re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32954
diff changeset
2185 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
2186 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
2187 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
2188 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
2189 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
2190 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
2191 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
2192 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
2193 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
2194 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
2195 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
2196 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
2197 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
2198 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
2199 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
2200 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
2201 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
2202 case RECC_ERROR: return false;
c782e22760e0 (re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32954
diff changeset
2203 default:
c782e22760e0 (re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32954
diff changeset
2204 abort();
31360
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2205 }
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2206 }
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2207
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2208 /* 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
2209 chars of class CC. */
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2210 static int
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2211 re_wctype_to_bit (cc)
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2212 re_wctype_t cc;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2213 {
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2214 switch (cc)
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2215 {
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2216 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
2217 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
2218 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
2219 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
2220 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
2221 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
2222 case RECC_SPACE: return BIT_SPACE;
31360
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2223 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
2224 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
2225 default:
c782e22760e0 (re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32954
diff changeset
2226 abort();
31360
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2227 }
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2228 }
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
2229 #endif
47233
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2230
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2231 /* 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
2232
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2233 /* 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
2234
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2235 static void
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2236 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
2237 struct range_table_work_area *work_area;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49276
diff changeset
2238 {
47233
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2239 work_area->allocated += 16 * sizeof (int);
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2240 if (work_area->table)
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2241 work_area->table
69039
f717c65a39d7 * regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 69038
diff changeset
2242 = (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
2243 else
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2244 work_area->table
69039
f717c65a39d7 * regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 69038
diff changeset
2245 = (int *) malloc (work_area->allocated);
47233
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2246 }
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2247
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
2248 #if 0
47233
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2249 #ifdef emacs
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 /* 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
2252 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
2253 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
2254 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
2255 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
2256
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2257 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
2258 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
2259
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2260 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
2261
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2262 static int
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2263 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
2264 RE_TRANSLATE_TYPE translate;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2265 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
2266 re_wchar_t start, end;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2267 {
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2268 /* `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
2269 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
2270 This includes all ASCII non-letters.
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 `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
2273 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
2274 This includes all ASCII 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 `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
2277 case-equivalent. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49276
diff changeset
2278
47233
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2279 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
2280
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2281 /* 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
2282 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
2283 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
2284 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
2285 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
2286 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
2287
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2288 enum case_type run_type = strange;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2289 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
2290
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2291 Lisp_Object eqv_table;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2292
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2293 if (!RE_TRANSLATE_P (translate))
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2294 {
47250
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2295 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
2296 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
2297 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
2298 return -1;
47233
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2299 }
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2300
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2301 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
2302
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2303 for (; start <= end; start++)
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 enum case_type this_type;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2306 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
2307 int minchar, maxchar;
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 /* Classify this character */
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2310 if (eqv == start)
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2311 this_type = one_case;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2312 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
2313 this_type = two_case;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2314 else
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2315 this_type = strange;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2316
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2317 if (start < eqv)
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2318 minchar = start, maxchar = eqv;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2319 else
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2320 minchar = eqv, maxchar = start;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2321
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2322 /* 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
2323 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
2324 || !(minchar == run_end + 1
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2325 && (run_type == two_case
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2326 ? maxchar == run_eqv_end + 1 : 1)))
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2327 {
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2328 /* No, end the run.
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2329 Record each of its equivalent ranges. */
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2330 if (run_type == one_case)
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 EXTEND_RANGE_TABLE (work_area, 2);
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2333 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
2334 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
2335 }
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2336 else if (run_type == two_case)
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2337 {
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2338 EXTEND_RANGE_TABLE (work_area, 4);
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2339 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
2340 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
2341 work_area->table[work_area->used++]
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2342 = RE_TRANSLATE (eqv_table, run_start);
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++]
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2344 = RE_TRANSLATE (eqv_table, run_end);
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2345 }
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2346 run_type = strange;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2347 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49276
diff changeset
2348
47233
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2349 if (this_type == strange)
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2350 {
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2351 /* 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
2352 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
2353 do
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 EXTEND_RANGE_TABLE (work_area, 2);
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2356 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
2357 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
2358 eqv = RE_TRANSLATE (eqv_table, eqv);
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2359 }
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2360 while (eqv != start);
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2361 }
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2362
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2363 /* 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
2364 else if (run_type == strange)
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 /* Initialize a new range. */
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2367 run_type = this_type;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2368 run_start = start;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2369 run_end = start;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2370 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
2371 }
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2372 else
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2373 {
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2374 /* Extend a running range. */
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2375 run_end = minchar;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2376 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
2377 }
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2378 }
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2379
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2380 /* 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
2381 by recording its equivalent ranges. */
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2382 if (run_type == one_case)
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 EXTEND_RANGE_TABLE (work_area, 2);
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2385 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
2386 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
2387 }
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2388 else if (run_type == two_case)
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2389 {
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2390 EXTEND_RANGE_TABLE (work_area, 4);
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2391 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
2392 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
2393 work_area->table[work_area->used++]
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2394 = RE_TRANSLATE (eqv_table, run_start);
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++]
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2396 = RE_TRANSLATE (eqv_table, run_end);
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2397 }
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2398
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2399 return -1;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2400 }
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 #endif /* emacs */
47008
c299d527a088 (PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44145
diff changeset
2403
105426
d0a6d64c3cfc Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
2404 /* Record 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
2405 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
2406 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
2407 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
2408 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
2409 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
2410
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2411 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
2412
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2413 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
2414
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2415 static int
47008
c299d527a088 (PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44145
diff changeset
2416 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
2417 RE_TRANSLATE_TYPE translate;
c299d527a088 (PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44145
diff changeset
2418 struct range_table_work_area *work_area;
c299d527a088 (PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44145
diff changeset
2419 re_wchar_t start, end;
c299d527a088 (PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44145
diff changeset
2420 {
47233
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2421 re_wchar_t cmin, cmax;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2422
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2423 #ifdef emacs
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2424 /* 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
2425 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
2426 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
2427 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
2428 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
2429 && !(start < 04200 && end >= 04377))
47233
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2430 {
47250
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2431 int newend;
47233
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2432 int tem;
47250
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2433 newend = end;
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2434 if (newend > 04377)
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2435 newend = 04377;
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2436 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
2437 if (tem > 0)
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2438 return tem;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2439
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2440 start = 04400;
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2441 if (end < 04400)
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2442 return -1;
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 #endif
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2445
47250
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2446 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
2447 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
2448 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
2449
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2450 cmin = -1, cmax = -1;
47233
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2451
47008
c299d527a088 (PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44145
diff changeset
2452 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
2453 {
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2454 int ch;
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2455
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2456 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
2457 {
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2458 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
2459 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
2460 {
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2461 if (cmin == -1)
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2462 cmin = c, cmax = c;
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2463 else
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 cmin = MIN (cmin, c);
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2466 cmax = MAX (cmax, c);
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2467 }
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 }
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2470
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2471 if (cmin != -1)
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 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
2474 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
2475 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
2476 }
923aa802303b (set_image_of_range_1): In no-TRANSLATE case,
Richard M. Stallman <rms@gnu.org>
parents: 47233
diff changeset
2477 }
47233
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2478
620fccf981d3 (set_image_of_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 47008
diff changeset
2479 return -1;
47008
c299d527a088 (PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44145
diff changeset
2480 }
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
2481 #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
2482
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2483 #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
2484
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2485 /* 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
2486 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
2487 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
2488 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
2489 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
2490 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
2491
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 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
2493
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 /* 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
2495 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
2496 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
2497 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
2498
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
2499 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
2500 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
2501
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 /* 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
2503 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
2504
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 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
2506 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
2507 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
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 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
2510 {
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
2511 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
2512 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
2513 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
2514 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
2515
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2516 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
2517 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2518 }
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 #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
2521
28163
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
2522 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
2523 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
2524 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
2525
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2526 /* `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
2527 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
2528
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2529 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
2530 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
2531
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 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
2533 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
2534 `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
2535 `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
2536 `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
2537 `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
2538 `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
2539 `not_bol' and `not_eol' are zero;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
2540
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
2541 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
2542
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
2543 /* 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
2544 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
2545 #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
2546 do { \
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
2547 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
2548 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
2549 } 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
2550
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
2551
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2552 /* 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
2553 #define FREE_STACK_RETURN(value) \
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2554 do { \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2555 FREE_RANGE_TABLE_WORK_AREA (range_table_work); \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2556 free (compile_stack.stack); \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2557 return value; \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2558 } 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
2559
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2560 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
2561 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
2562 re_char *pattern;
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
2563 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
2564 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
2565 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
2566 {
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
2567 /* We fetch characters from PATTERN here. */
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
2568 register re_wchar_t c, c1;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
2569
11864
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 /* 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
2571 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
2572
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2573 /* 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
2574 register unsigned char *b;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
2575
11864
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 /* 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
2577 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
2578
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2579 /* 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
2580 #ifdef AIX
dc8ce74d8633 (regex_compile): Declare p with non-const type on AIX.
Richard M. Stallman <rms@gnu.org>
parents: 22411
diff changeset
2581 /* `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
2582 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
2583 #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
2584 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
2585 #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
2586 re_char *pend = pattern + size;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
2587
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2588 /* 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
2589 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
2590
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2591 /* 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
2592 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
2593 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
2594 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
2595 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
2596
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 /* 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
2598 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
2599 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
2600 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
2601
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 /* 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
2603 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
2604
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 /* 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
2606 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
2607 re_char *beg_interval;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
2608
11864
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 /* 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
2610 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
2611 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
2612 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
2613
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2614 /* Work area for range table of charset. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2615 struct range_table_work_area range_table_work;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2616
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
2617 /* 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
2618 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
2619
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
2620 /* 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
2621 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
2622
58325
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2623 /* 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
2624 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
2625
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2626 /* 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
2627 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
2628 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
2629 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
2630 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
2631
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2632 #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
2633 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
2634 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
2635 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
2636 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2637 unsigned debug_count;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
2638
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2639 for (debug_count = 0; debug_count < size; debug_count++)
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2640 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
2641 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
2642 }
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 #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
2644
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 /* 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
2646 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
2647 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
2648 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
2649
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.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
2651 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
2652
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2653 range_table_work.table = 0;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2654 range_table_work.allocated = 0;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2655
11864
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 /* 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
2657 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
2658 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
2659 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
2660 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
2661
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 /* 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
2663 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
2664 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
2665 bufp->used = 0;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
2666
11864
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 /* 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
2668 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
2669
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
2670 #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
2671 /* 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
2672 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
2673 #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
2674
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 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
2676 {
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 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
2678 { /* If zero allocated, but buffer is non-null, try to realloc
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2679 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
2680 that is the user's responsibility. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2681 RETALLOC (bufp->buffer, INIT_BUF_SIZE, unsigned char);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2682 }
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2683 else
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
2684 { /* Caller did not allocate a buffer. Do it for them. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2685 bufp->buffer = TALLOC (INIT_BUF_SIZE, unsigned char);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
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 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
2688
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2689 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
2690 }
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
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 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
2693
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 /* 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
2695 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
2696 {
58325
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2697 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
2698 {
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2699 /* 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
2700 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
2701 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
2702 {
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2703 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
2704 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
2705 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
2706 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
2707 continue;
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2708 }
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2709 /* 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
2710 break;
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2711 }
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2712
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2713 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
2714
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2715 switch (c)
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2716 {
58325
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2717 case ' ':
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2718 {
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2719 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
2720
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2721 /* If there's no special whitespace regexp, treat
58328
829390516ec0 Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 58325
diff changeset
2722 spaces normally. And don't try to do this recursively. */
829390516ec0 Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 58325
diff changeset
2723 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
2724 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
2725
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2726 /* 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
2727 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
2728 {
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2729 if (*p1 != ' ')
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2730 break;
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2731 p1++;
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 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
2734 treat them normally. */
58780
7f1f68f88ae8 (regex_compile): Fix end-of-pattern case for space.
Richard M. Stallman <rms@gnu.org>
parents: 58328
diff changeset
2735 if (p1 != pend
7f1f68f88ae8 (regex_compile): Fix end-of-pattern case for space.
Richard M. Stallman <rms@gnu.org>
parents: 58328
diff changeset
2736 && (*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
2737 || (*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
2738 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
2739
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2740 /* 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
2741 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
2742 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
2743 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
2744 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
2745 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
2746 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
2747 break;
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
2748 }
58325
d82983edcbe6 (regex_compile): Substitute whitespace_regexp for spaces, if it is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 57665
diff changeset
2749
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2750 case '^':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2751 {
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
2752 if ( /* If at start of pattern, it's an operator. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2753 p == pattern + 1
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
2754 /* If context independent, it's an operator. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2755 || syntax & RE_CONTEXT_INDEP_ANCHORS
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
2756 /* Otherwise, depends on what's come before. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2757 || 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
2758 BUF_PUSH ((syntax & RE_NO_NEWLINE_ANCHOR) ? begbuf : begline);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2759 else
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2760 goto normal_char;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2761 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2762 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2763
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2764
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2765 case '$':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2766 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2767 if ( /* If at end of pattern, it's an operator. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2768 p == pend
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
2769 /* If context independent, it's an operator. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2770 || syntax & RE_CONTEXT_INDEP_ANCHORS
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2771 /* Otherwise, depends on what's next. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2772 || 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
2773 BUF_PUSH ((syntax & RE_NO_NEWLINE_ANCHOR) ? endbuf : endline);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2774 else
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2775 goto normal_char;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2776 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2777 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
2778
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2779
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2780 case '+':
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2781 case '?':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2782 if ((syntax & RE_BK_PLUS_QM)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2783 || (syntax & RE_LIMITED_OPS))
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2784 goto normal_char;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2785 handle_plus:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2786 case '*':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2787 /* If there is no previous pattern... */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2788 if (!laststart)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2789 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2790 if (syntax & RE_CONTEXT_INVALID_OPS)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2791 FREE_STACK_RETURN (REG_BADRPT);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2792 else if (!(syntax & RE_CONTEXT_INDEP_OPS))
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2793 goto normal_char;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2794 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2795
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2796 {
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
2797 /* 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
2798 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
2799 boolean greedy = 1;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2800
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2801 /* If there is a sequence of repetition chars, collapse it
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2802 down to just one (the right one). We can't combine
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2803 interval operators with these because of, e.g., `a{2}*',
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
2804 which should only match an even number of `a's. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2805
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2806 for (;;)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2807 {
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
2808 if ((syntax & RE_FRUGAL)
26906
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2809 && 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
2810 greedy = 0;
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2811 else
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2812 {
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2813 zero_times_ok |= c != '+';
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2814 many_times_ok |= c != '?';
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2815 }
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2816
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2817 if (p == pend)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2818 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
2819 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
2820 || (!(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
2821 && (*p == '+' || *p == '?')))
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2822 ;
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 (syntax & RE_BK_PLUS_QM && *p == '\\')
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2824 {
28372
bc86be15099e (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28342
diff changeset
2825 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
2826 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
2827 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
2828 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
2829 else
bc86be15099e (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28342
diff changeset
2830 break;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2831 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2832 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
2833 break;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2834 /* 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
2835 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
2836 }
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2837
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2838 /* Star, etc. applied to an empty pattern is equivalent
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2839 to an empty pattern. */
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2840 if (!laststart || laststart == b)
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2841 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2842
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2843 /* Now we know whether or not zero matches is allowed
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
2844 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
2845 if (greedy)
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2846 {
28163
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
2847 if (many_times_ok)
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2848 {
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2849 boolean simple = skip_one_char (laststart) == b;
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2850 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
2851 re_opcode_t ofj =
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
2852 /* 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
2853 (simple || !analyse_first (laststart, b, NULL, 0))
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
2854 ? on_failure_jump : on_failure_jump_loop;
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2855 assert (skip_one_char (laststart) <= b);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49276
diff changeset
2856
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2857 if (!zero_times_ok && simple)
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2858 { /* 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
2859 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
2860 into PP* if P is simple. */
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2861 unsigned char *p1, *p2;
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2862 startoffset = b - laststart;
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2863 GET_BUFFER_SPACE (startoffset);
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2864 p1 = b; p2 = laststart;
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2865 while (p2 < p1)
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2866 *b++ = *p2++;
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2867 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
2868 }
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2869
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2870 GET_BUFFER_SPACE (6);
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2871 if (!zero_times_ok)
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2872 /* A + loop. */
28380
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
2873 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
2874 else
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2875 /* 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
2876 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
2877 that yet, we leave the decision up to
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2878 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
2879 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
2880 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
2881 b += 3;
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2882 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
2883 b += 3;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2884 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2885 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
2886 {
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2887 /* A simple ? pattern. */
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2888 assert (zero_times_ok);
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2889 GET_BUFFER_SPACE (3);
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2890 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
2891 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
2892 }
26906
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2893 }
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2894 else /* not greedy */
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2895 { /* 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
2896
28342
9761cf2351fa (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28279
diff changeset
2897 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
2898 if (many_times_ok)
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2899 {
28380
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
2900 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
2901
47368
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
2902 /* The non-greedy multiple match looks like
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
2903 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
2904 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
2905 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
2906 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
2907 : 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
2908 b += 3;
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2909 if (zero_times_ok)
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2910 {
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2911 /* 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
2912 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
2913 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
2914 INSERT_JUMP (jump, laststart, b);
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2915 b += 3;
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2916 }
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2917 }
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2918 else
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2919 {
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2920 /* non-greedy a?? */
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2921 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
2922 b += 3;
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2923 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
2924 b += 3;
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2925 }
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2926 }
5eb1e428de28 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 26237
diff changeset
2927 }
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
2928 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
2929 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
2930
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2931
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
2932 case '.':
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2933 laststart = b;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2934 BUF_PUSH (anychar);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2935 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2936
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2937
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2938 case '[':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2939 {
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2940 CLEAR_RANGE_TABLE_WORK_USED (range_table_work);
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2941
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2942 if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2943
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2944 /* Ensure that we have enough space to push a charset: the
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2945 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
2946 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
2947
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2948 laststart = b;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2949
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2950 /* We test `*p == '^' twice, instead of using an if
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
2951 statement, so we only need one BUF_PUSH. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2952 BUF_PUSH (*p == '^' ? charset_not : charset);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2953 if (*p == '^')
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2954 p++;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2955
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2956 /* Remember the first position in the bracket expression. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2957 p1 = p;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2958
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
2959 /* Push the number of bytes in the bitmap. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2960 BUF_PUSH ((1 << BYTEWIDTH) / BYTEWIDTH);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2961
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2962 /* Clear the whole map. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2963 bzero (b, (1 << BYTEWIDTH) / BYTEWIDTH);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2964
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2965 /* charset_not matches newline according to a syntax bit. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2966 if ((re_opcode_t) b[-2] == charset_not
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2967 && (syntax & RE_HAT_LISTS_NOT_NEWLINE))
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2968 SET_LIST_BIT ('\n');
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2969
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
2970 /* Read in characters and ranges, setting map bits. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2971 for (;;)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2972 {
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2973 boolean escaped_char = false;
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
2974 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
2975 re_wchar_t ch, c2;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2976
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2977 if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2978
47008
c299d527a088 (PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44145
diff changeset
2979 /* 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
2980 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
2981 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
2982 (let ((case-fold-search t)) (string-match "[A-_]" "A")) */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2983 PATFETCH (c);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2984
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2985 /* \ might escape characters inside [...] and [^...]. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2986 if ((syntax & RE_BACKSLASH_ESCAPE_IN_LISTS) && c == '\\')
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2987 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2988 if (p == pend) FREE_STACK_RETURN (REG_EESCAPE);
16010
4addc35d079b Clean up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 16009
diff changeset
2989
4addc35d079b Clean up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 16009
diff changeset
2990 PATFETCH (c);
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2991 escaped_char = true;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
2992 }
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2993 else
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
2994 {
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
2995 /* Could be the end of the bracket expression. If it's
19184
83b4daf16443 Whitespace change.
Richard M. Stallman <rms@gnu.org>
parents: 18614
diff changeset
2996 not (i.e., when the bracket expression is `[]' so
83b4daf16443 Whitespace change.
Richard M. Stallman <rms@gnu.org>
parents: 18614
diff changeset
2997 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
2998 if (c == ']' && p2 != p1)
19184
83b4daf16443 Whitespace change.
Richard M. Stallman <rms@gnu.org>
parents: 18614
diff changeset
2999 break;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3000 }
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3001
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3002 /* See if we're at the beginning of a possible character
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3003 class. */
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3004
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
3005 if (!escaped_char &&
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
3006 syntax & RE_CHAR_CLASSES && c == '[' && *p == ':')
19184
83b4daf16443 Whitespace change.
Richard M. Stallman <rms@gnu.org>
parents: 18614
diff changeset
3007 {
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
3008 /* Leave room for the null. */
31360
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3009 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
3010 const unsigned char *class_beg;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3011
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3012 PATFETCH (c);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3013 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
3014 class_beg = p;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3015
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3016 /* If pattern is `[[:'. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3017 if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3018
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3019 for (;;)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3020 {
31360
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3021 PATFETCH (c);
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3022 if ((c == ':' && *p == ']') || p == pend)
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3023 break;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3024 if (c1 < CHAR_CLASS_MAX_LENGTH)
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3025 str[c1++] = c;
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3026 else
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3027 /* 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
3028 str[0] = '\0';
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3029 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3030 str[c1] = '\0';
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3031
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3032 /* If isn't a word bracketed by `[:' and `:]':
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3033 undo the ending character, the letters, and
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3034 leave the leading `:' and `[' (but set bits for
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3035 them). */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3036 if (c == ':' && *p == ']')
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3037 {
31360
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3038 re_wctype_t cc;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
3039 int limit;
31360
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3040
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3041 cc = re_wctype (str);
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3042
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3043 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
3044 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
3045
31360
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3046 /* 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
3047 class. */
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3048 PATFETCH (c);
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3049
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3050 if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3051
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3052 #ifndef emacs
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3053 for (ch = 0; ch < (1 << BYTEWIDTH); ++ch)
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
3054 if (re_iswctype (btowc (ch), cc))
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
3055 {
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
3056 c = TRANSLATE (ch);
90727
a664c8170666 (regex_compile): Synch with HEAD.
Kenichi Handa <handa@m17n.org>
parents: 90718
diff changeset
3057 if (c < (1 << BYTEWIDTH))
a664c8170666 (regex_compile): Synch with HEAD.
Kenichi Handa <handa@m17n.org>
parents: 90718
diff changeset
3058 SET_LIST_BIT (c);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
3059 }
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3060 #else /* emacs */
25440
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
3061 /* 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
3062 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
3063 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
3064 they can only match ASCII characters. We
31360
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3065 don't need to handle them for multibyte.
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
3066 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
3067
107336
a2b9cb6b7cb7 * regex.c (regex_compile): Setup gl_state as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106999
diff changeset
3068 /* Setup the gl_state object to its buffer-defined
a2b9cb6b7cb7 * regex.c (regex_compile): Setup gl_state as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106999
diff changeset
3069 value. This hardcodes the buffer-global
a2b9cb6b7cb7 * regex.c (regex_compile): Setup gl_state as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106999
diff changeset
3070 syntax-table for ASCII chars, while the other chars
a2b9cb6b7cb7 * regex.c (regex_compile): Setup gl_state as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106999
diff changeset
3071 will obey syntax-table properties. It's not ideal,
a2b9cb6b7cb7 * regex.c (regex_compile): Setup gl_state as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106999
diff changeset
3072 but it's the way it's been done until now. */
107366
14ff9accfbd3 Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107336
diff changeset
3073 SETUP_BUFFER_SYNTAX_TABLE ();
107336
a2b9cb6b7cb7 * regex.c (regex_compile): Setup gl_state as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106999
diff changeset
3074
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3075 for (ch = 0; ch < 256; ++ch)
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3076 {
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3077 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
3078 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
3079 && re_iswctype (c, cc))
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
3080 {
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3081 SET_LIST_BIT (ch);
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3082 c1 = TRANSLATE (c);
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3083 if (c1 == c)
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3084 continue;
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3085 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
3086 SET_LIST_BIT (c1);
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3087 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
3088 SET_LIST_BIT (c1);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
3089 }
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3090 }
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3091 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
3092 (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
3093 #endif /* emacs */
73229
3501fcb2e68c (regex_compile): Set the new `used_syntax' bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73056
diff changeset
3094 /* 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
3095 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
3096 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
3097 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
3098 the two exceptions. */
3501fcb2e68c (regex_compile): Set the new `used_syntax' bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73056
diff changeset
3099 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
3100 bufp->used_syntax = 1;
3501fcb2e68c (regex_compile): Set the new `used_syntax' bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73056
diff changeset
3101
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3102 /* Repeat the loop. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3103 continue;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3104 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3105 else
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3106 {
28372
bc86be15099e (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28342
diff changeset
3107 /* 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
3108 p = class_beg;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3109 SET_LIST_BIT ('[');
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3110
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3111 /* Because the `:' may starts the range, we
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3112 can't simply set bit and repeat the loop.
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
3113 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
3114 c = ':';
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3115 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3116 }
18260
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 if (p < pend && p[0] == '-' && p[1] != ']')
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3119 {
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 /* Discard the `-'. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3122 PATFETCH (c1);
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3123
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3124 /* Fetch the character which ends the range. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3125 PATFETCH (c1);
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3126 #ifdef emacs
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3127 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
3128 && ! 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
3129 /* 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
3130 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
3131 c = c1 + 1;
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3132 #endif /* emacs */
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3133 }
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3134 else
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3135 /* Range from C to C. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3136 c1 = c;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3137
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3138 if (c > c1)
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3139 {
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3140 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
3141 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
3142 /* Else, repeat the loop. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3143 }
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
3144 else
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3145 {
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3146 #ifndef emacs
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3147 /* Set the range into bitmap */
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89457
diff changeset
3148 for (; c <= c1; c++)
16010
4addc35d079b Clean up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 16009
diff changeset
3149 {
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3150 ch = TRANSLATE (c);
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3151 if (ch < (1 << BYTEWIDTH))
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3152 SET_LIST_BIT (ch);
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3153 }
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3154 #else /* emacs */
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3155 if (c < 128)
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3156 {
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3157 ch = MIN (127, c1);
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3158 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
3159 c = ch + 1;
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3160 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
3161 c = BYTE8_TO_CHAR (128);
16010
4addc35d079b Clean up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 16009
diff changeset
3162 }
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3163 if (c <= c1)
16010
4addc35d079b Clean up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 16009
diff changeset
3164 {
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3165 if (CHAR_BYTE8_P (c))
74323
ad2b5e25b8f0 (regex_compile): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 74277
diff changeset
3166 {
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3167 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
3168 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
3169 for (; c <= c1; c++)
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3170 SET_LIST_BIT (c);
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3171 }
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3172 else if (multibyte)
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3173 {
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3174 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
3175 }
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3176 else
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3177 {
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3178 SETUP_UNIBYTE_RANGE (range_table_work, c, c1);
74323
ad2b5e25b8f0 (regex_compile): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 74277
diff changeset
3179 }
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
3180 }
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3181 #endif /* emacs */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3182 }
16010
4addc35d079b Clean up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 16009
diff changeset
3183 }
4addc35d079b Clean up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 16009
diff changeset
3184
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3185 /* 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
3186 end of the map. Decrease the map-length byte too. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3187 while ((int) b[-1] > 0 && b[b[-1] - 1] == 0)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3188 b[-1]--;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3189 b += b[-1];
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3190
25440
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
3191 /* 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
3192 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
3193 || RANGE_TABLE_WORK_BITS (range_table_work))
18260
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 int i;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3196 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
3197
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3198 /* 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
3199 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
3200 each character. */
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
3201 GET_BUFFER_SPACE (4 + used * 3);
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3202
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3203 /* Indicate the existence of range table. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3204 laststart[1] |= 0x80;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3205
25440
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
3206 /* 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
3207 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
3208 *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
3209 *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
3210
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3211 STORE_NUMBER_AND_INCR (b, used / 2);
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3212 for (i = 0; i < used; i++)
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3213 STORE_CHARACTER_AND_INCR
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3214 (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
3215 }
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3216 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3217 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
3218
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3219
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3220 case '(':
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3221 if (syntax & RE_NO_BK_PARENS)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3222 goto handle_open;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3223 else
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3224 goto normal_char;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3225
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3226
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3227 case ')':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3228 if (syntax & RE_NO_BK_PARENS)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3229 goto handle_close;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3230 else
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3231 goto normal_char;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3232
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3233
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3234 case '\n':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3235 if (syntax & RE_NEWLINE_ALT)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3236 goto handle_alt;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3237 else
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3238 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
3239
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3240
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3241 case '|':
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3242 if (syntax & RE_NO_BK_VBAR)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3243 goto handle_alt;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3244 else
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3245 goto normal_char;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3246
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3247
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3248 case '{':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3249 if (syntax & RE_INTERVALS && syntax & RE_NO_BK_BRACES)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3250 goto handle_interval;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3251 else
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3252 goto normal_char;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3253
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3254
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3255 case '\\':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3256 if (p == pend) FREE_STACK_RETURN (REG_EESCAPE);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3257
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3258 /* Do not translate the character after the \, so that we can
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3259 distinguish, e.g., \B from \b, even if we normally would
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3260 translate, e.g., B to b. */
47008
c299d527a088 (PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44145
diff changeset
3261 PATFETCH (c);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3263 switch (c)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3264 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3265 case '(':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3266 if (syntax & RE_NO_BK_PARENS)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3267 goto normal_backslash;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3268
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3269 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
3270 {
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
3271 int shy = 0;
81329
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3272 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
3273 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
3274 {
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
3275 /* 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
3276 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
3277 {
28372
bc86be15099e (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28342
diff changeset
3278 PATFETCH (c); /* Gobble up the '?'. */
81329
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3279 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
3280 {
81329
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3281 PATFETCH (c);
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3282 switch (c)
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3283 {
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3284 case ':': shy = 1; break;
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3285 case '0':
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3286 /* An explicitly specified regnum must start
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3287 with non-0. */
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3288 if (regnum == 0)
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3289 FREE_STACK_RETURN (REG_BADPAT);
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3290 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
3291 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
3292 regnum = 10*regnum + (c - '0'); break;
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3293 default:
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3294 /* Only (?:...) is supported right now. */
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3295 FREE_STACK_RETURN (REG_BADPAT);
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3296 }
28062
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 }
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
3299 }
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
3300
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
3301 if (!shy)
81329
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3302 regnum = ++bufp->re_nsub;
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3303 else if (regnum)
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3304 { /* 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
3305 shy = 0;
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3306 if (regnum > bufp->re_nsub)
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3307 bufp->re_nsub = regnum;
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3308 else if (regnum > bufp->re_nsub
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3309 /* 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
3310 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
3311 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
3312 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
3313 of enough info to do that easily. */
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3314 || group_in_compile_stack (compile_stack, regnum))
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3315 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
3316 }
81329
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3317 else
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3318 /* It's really shy. */
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3319 regnum = - bufp->re_nsub;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3320
28163
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
3321 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
3322 {
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
3323 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
3324 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
3325 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
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 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
3328 }
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
3329
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
3330 /* 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
3331 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
3332 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
3333 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
3334 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
3335 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
3336 = 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
3337 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
3338 COMPILE_STACK_TOP.regnum = regnum;
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3339
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3340 /* 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
3341 we can represent in the compiled pattern. */
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3342 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
3343 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
3344
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
3345 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
3346
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
3347 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
3348 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
3349 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
3350 /* 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
3351 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
3352 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
3353 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
3354 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
3355 }
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3356
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3357 case ')':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3358 if (syntax & RE_NO_BK_PARENS) goto normal_backslash;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3359
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3360 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
3361 {
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
3362 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
3363 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
3364 else
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
3365 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
3366 }
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3367
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3368 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
3369 FIXUP_ALT_JUMP ();
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3370
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3371 /* See similar code for backslashed left paren above. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3372 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
3373 {
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
3374 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
3375 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
3376 else
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
3377 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
3378 }
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3379
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3380 /* Since we just checked for an empty stack above, this
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3381 ``can't happen''. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3382 assert (compile_stack.avail != 0);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3383 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3384 /* We don't just want to restore into `regnum', because
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3385 later groups should continue to be numbered higher,
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
3386 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
3387 regnum_t regnum;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3388
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3389 compile_stack.avail--;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3390 begalt = bufp->buffer + COMPILE_STACK_TOP.begalt_offset;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3391 fixup_alt_jump
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3392 = COMPILE_STACK_TOP.fixup_alt_jump
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3393 ? bufp->buffer + COMPILE_STACK_TOP.fixup_alt_jump - 1
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3394 : 0;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3395 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
3396 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
3397 /* 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
3398 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
3399 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
3400 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
3401
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3402 /* 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
3403 groups were inside this one. */
81329
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3404 if (regnum <= MAX_REGNUM && regnum > 0)
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3405 BUF_PUSH_2 (stop_memory, regnum);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3406 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3407 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3408
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3409
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3410 case '|': /* `\|'. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3411 if (syntax & RE_LIMITED_OPS || syntax & RE_NO_BK_VBAR)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3412 goto normal_backslash;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3413 handle_alt:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3414 if (syntax & RE_LIMITED_OPS)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3415 goto normal_char;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3416
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3417 /* Insert before the previous alternative a jump which
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
3418 jumps to this alternative if the former fails. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3419 GET_BUFFER_SPACE (3);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3420 INSERT_JUMP (on_failure_jump, begalt, b + 6);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3421 pending_exact = 0;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3422 b += 3;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3423
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3424 /* The alternative before this one has a jump after it
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3425 which gets executed if it gets matched. Adjust that
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3426 jump so it will jump to this alternative's analogous
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3427 jump (put in below, which in turn will jump to the next
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3428 (if any) alternative's such jump, etc.). The last such
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3429 jump jumps to the correct final destination. A picture:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3430 _____ _____
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3431 | | | |
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3432 | v | v
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3433 a | b | c
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3434
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3435 If we are at `b', then fixup_alt_jump right now points to a
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3436 three-byte space after `a'. We'll put in the jump, set
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3437 fixup_alt_jump to right after `b', and leave behind three
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3438 bytes which we'll fill in when we get to after `c'. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3439
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
3440 FIXUP_ALT_JUMP ();
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3441
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3442 /* Mark and leave space for a jump after this alternative,
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3443 to be filled in later either by next alternative or
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3444 when know we're at the end of a series of alternatives. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3445 fixup_alt_jump = b;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3446 GET_BUFFER_SPACE (3);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3447 b += 3;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3448
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3449 laststart = 0;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3450 begalt = b;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3451 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3452
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3453
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3454 case '{':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3455 /* If \{ is a literal. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3456 if (!(syntax & RE_INTERVALS)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3457 /* If we're at `\{' and it's not the open-interval
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3458 operator. */
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
3459 || (syntax & RE_NO_BK_BRACES))
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3460 goto normal_backslash;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3461
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3462 handle_interval:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3463 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3464 /* If got here, then the syntax allows intervals. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3465
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3466 /* 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
3467 int lower_bound = 0, upper_bound = -1;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3468
28372
bc86be15099e (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28342
diff changeset
3469 beg_interval = p;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3470
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3471 GET_UNSIGNED_NUMBER (lower_bound);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3472
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3473 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
3474 GET_UNSIGNED_NUMBER (upper_bound);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3475 else
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3476 /* Interval such as `{1}' => match exactly once. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3477 upper_bound = lower_bound;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3478
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3479 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
3480 || (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
3481 FREE_STACK_RETURN (REG_BADBR);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3482
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3483 if (!(syntax & RE_NO_BK_BRACES))
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3484 {
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
3485 if (c != '\\')
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
3486 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
3487 if (p == pend)
5f1c0193e984 (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58780
diff changeset
3488 FREE_STACK_RETURN (REG_EESCAPE);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3489 PATFETCH (c);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3490 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3491
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3492 if (c != '}')
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
3493 FREE_STACK_RETURN (REG_BADBR);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3494
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3495 /* We just parsed a valid interval. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3496
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3497 /* If it's invalid to have no preceding re. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3498 if (!laststart)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3499 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3500 if (syntax & RE_CONTEXT_INVALID_OPS)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3501 FREE_STACK_RETURN (REG_BADRPT);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3502 else if (syntax & RE_CONTEXT_INDEP_OPS)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3503 laststart = b;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3504 else
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3505 goto unfetch_interval;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3506 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3507
47368
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3508 if (upper_bound == 0)
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3509 /* 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
3510 altogether. */
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3511 b = laststart;
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3512 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
3513 /* 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
3514 ;
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3515
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3516 /* Otherwise, we have a nontrivial interval. When
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3517 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
3518 set_number_at <jump count> <upper bound>
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3519 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
3520 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
3521 <body of loop>
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3522 jump_n <succeed_n addr> <jump count>
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3523 (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
3524 `upper_bound' is 1, though.) */
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3525 else
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3526 { /* 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
3527 more at the end of the loop. */
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3528 unsigned int nbytes = (upper_bound < 0 ? 3
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3529 : upper_bound > 1 ? 5 : 0);
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3530 unsigned int startoffset = 0;
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3531
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3532 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
3533
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3534 if (lower_bound == 0)
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3535 {
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3536 /* 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
3537 a simple on_failure_jump_loop. */
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3538 INSERT_JUMP (on_failure_jump_loop, laststart,
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3539 b + 3 + nbytes);
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3540 b += 3;
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3541 }
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3542 else
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3543 {
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3544 /* 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
3545 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
3546 attendant `set_number_at' (inserted next),
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3547 because `re_compile_fastmap' needs to know.
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3548 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
3549 INSERT_JUMP2 (succeed_n, laststart,
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3550 b + 5 + nbytes,
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3551 lower_bound);
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3552 b += 5;
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3553
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3554 /* Code to initialize the lower bound. Insert
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
3555 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
3556 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
3557 the following `succeed_n'. */
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3558 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
3559 b += 5;
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3560 startoffset += 5;
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
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3563 if (upper_bound < 0)
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3564 {
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3565 /* A negative upper bound stands for infinity,
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3566 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
3567 STORE_JUMP (jump, b, laststart + startoffset);
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3568 b += 3;
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3569 }
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3570 else if (upper_bound > 1)
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3571 { /* More than one repetition is allowed, so
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3572 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
3573 that starts this interval.
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3574
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3575 When we've reached this during matching,
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3576 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
3577 jump back only `upper_bound - 1' times. */
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3578 STORE_JUMP2 (jump_n, b, laststart + startoffset,
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3579 upper_bound - 1);
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3580 b += 5;
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3581
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3582 /* 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
3583 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
3584 an absolute address. `laststart' will be
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3585 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
3586 `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
3587 for the relative address. But we are
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3588 inserting into the middle of the pattern --
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3589 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
3590 Conclusion: (b - 2) - (laststart + 3) + 5,
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3591 i.e., b - laststart.
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3592
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3593 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
3594 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
3595 reinitialize the bounds. */
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3596 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
3597 upper_bound - 1, b);
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3598 b += 5;
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3599 }
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
3600 }
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3601 pending_exact = 0;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3602 beg_interval = NULL;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3603 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3604 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3605
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3606 unfetch_interval:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3607 /* If an invalid interval, match the characters as literals. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3608 assert (beg_interval);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3609 p = beg_interval;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3610 beg_interval = NULL;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3611
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3612 /* 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
3613 c = '{';
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3614
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3615 if (!(syntax & RE_NO_BK_BRACES))
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
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 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
3618 goto normal_backslash;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3619 }
28372
bc86be15099e (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28342
diff changeset
3620 else
bc86be15099e (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28342
diff changeset
3621 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
3622
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3623 #ifdef emacs
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3624 /* 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
3625 operators. rms says this is ok. --karl */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3626 case '=':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3627 BUF_PUSH (at_dot);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3628 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3629
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3630 case 's':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3631 laststart = b;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3632 PATFETCH (c);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3633 BUF_PUSH_2 (syntaxspec, syntax_spec_code[c]);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3634 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3635
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3636 case 'S':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3637 laststart = b;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3638 PATFETCH (c);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3639 BUF_PUSH_2 (notsyntaxspec, syntax_spec_code[c]);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3640 break;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3641
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3642 case 'c':
16010
4addc35d079b Clean up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 16009
diff changeset
3643 laststart = b;
47008
c299d527a088 (PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44145
diff changeset
3644 PATFETCH (c);
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3645 BUF_PUSH_2 (categoryspec, c);
16010
4addc35d079b Clean up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 16009
diff changeset
3646 break;
4addc35d079b Clean up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 16009
diff changeset
3647
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3648 case 'C':
16010
4addc35d079b Clean up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 16009
diff changeset
3649 laststart = b;
47008
c299d527a088 (PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44145
diff changeset
3650 PATFETCH (c);
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3651 BUF_PUSH_2 (notcategoryspec, c);
16010
4addc35d079b Clean up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 16009
diff changeset
3652 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
3653 #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
3654
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3655
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3656 case 'w':
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
3657 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
3658 goto normal_char;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3659 laststart = b;
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
3660 BUF_PUSH_2 (syntaxspec, Sword);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3661 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3662
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3663
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3664 case 'W':
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
3665 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
3666 goto normal_char;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3667 laststart = b;
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
3668 BUF_PUSH_2 (notsyntaxspec, Sword);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3669 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3670
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3671
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3672 case '<':
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
3673 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
3674 goto normal_char;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3675 BUF_PUSH (wordbeg);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3676 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3677
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3678 case '>':
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
3679 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
3680 goto normal_char;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3681 BUF_PUSH (wordend);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3682 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3683
55690
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
3684 case '_':
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
3685 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
3686 goto normal_char;
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
3687 laststart = b;
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
3688 PATFETCH (c);
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
3689 if (c == '<')
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
3690 BUF_PUSH (symbeg);
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
3691 else if (c == '>')
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
3692 BUF_PUSH (symend);
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
3693 else
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
3694 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
3695 break;
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
3696
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3697 case 'b':
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
3698 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
3699 goto normal_char;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3700 BUF_PUSH (wordbound);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3701 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3702
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3703 case 'B':
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
3704 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
3705 goto normal_char;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3706 BUF_PUSH (notwordbound);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3707 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3708
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3709 case '`':
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
3710 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
3711 goto normal_char;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3712 BUF_PUSH (begbuf);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3713 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3714
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3715 case '\'':
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
3716 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
3717 goto normal_char;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3718 BUF_PUSH (endbuf);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3719 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3720
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3721 case '1': case '2': case '3': case '4': case '5':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3722 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
3723 {
c782e22760e0 (re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32954
diff changeset
3724 regnum_t reg;
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 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
3727 goto normal_backslash;
c782e22760e0 (re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32954
diff changeset
3728
c782e22760e0 (re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32954
diff changeset
3729 reg = c - '0';
c782e22760e0 (re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32954
diff changeset
3730
81329
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3731 if (reg > bufp->re_nsub || reg < 1
465e2d55267d (regex_compile): Remove the `regnum' counter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75348
diff changeset
3732 /* 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
3733 || 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
3734 FREE_STACK_RETURN (REG_ESUBREG);
c782e22760e0 (re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32954
diff changeset
3735
c782e22760e0 (re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32954
diff changeset
3736 laststart = b;
c782e22760e0 (re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32954
diff changeset
3737 BUF_PUSH_2 (duplicate, reg);
c782e22760e0 (re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32954
diff changeset
3738 }
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3739 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3740
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3741
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3742 case '+':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3743 case '?':
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3744 if (syntax & RE_BK_PLUS_QM)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3745 goto handle_plus;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3746 else
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3747 goto normal_backslash;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3748
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3749 default:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3750 normal_backslash:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3751 /* You might think it would be useful for \ to mean
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3752 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
3753 it will never match anything. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3754 goto normal_char;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3755 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3756 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
3757
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3758
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3759 default:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3760 /* 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
3761 normal_char:
47008
c299d527a088 (PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44145
diff changeset
3762 /* If no exactn currently being built. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3763 if (!pending_exact
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3764
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3765 /* If last exactn not at current position. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3766 || pending_exact + *pending_exact + 1 != b
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3767
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3768 /* 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
3769 || *pending_exact >= (1 << BYTEWIDTH) - MAX_MULTIBYTE_LENGTH
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3770
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
3771 /* If followed by a repetition operator. */
21963
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_BK_PLUS_QM)
21963
b717a61747c5 (regex_compile): When checking after exactn
Richard M. Stallman <rms@gnu.org>
parents: 21838
diff changeset
3774 ? 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
3775 : 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
3776 || ((syntax & RE_INTERVALS)
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3777 && ((syntax & RE_NO_BK_BRACES)
21963
b717a61747c5 (regex_compile): When checking after exactn
Richard M. Stallman <rms@gnu.org>
parents: 21838
diff changeset
3778 ? p != pend && *p == '{'
b717a61747c5 (regex_compile): When checking after exactn
Richard M. Stallman <rms@gnu.org>
parents: 21838
diff changeset
3779 : 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
3780 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3781 /* Start building a new exactn. */
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
3782
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3783 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
3784
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3785 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
3786 pending_exact = b - 1;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3787 }
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
3788
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
3789 GET_BUFFER_SPACE (MAX_MULTIBYTE_LENGTH);
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
3790 {
30752
db737e34fc36 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 29801
diff changeset
3791 int len;
db737e34fc36 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 29801
diff changeset
3792
db737e34fc36 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 29801
diff changeset
3793 if (multibyte)
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
3794 {
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3795 c = TRANSLATE (c);
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
3796 len = CHAR_STRING (c, b);
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
3797 b += len;
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
3798 }
30752
db737e34fc36 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 29801
diff changeset
3799 else
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
3800 {
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3801 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
3802 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
3803 {
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3804 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
3805
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3806 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
3807 c = c1;
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
3808 }
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
3809 *b++ = c;
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
3810 len = 1;
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
3811 }
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
3812 (*pending_exact) += len;
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
3813 }
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
3814
11864
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 break;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3816 } /* 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
3817 } /* 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
3818
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
3819
11864
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 /* Through the pattern now. */
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
3821
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
3822 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
3823
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
3824 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
3825 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
3826
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 /* 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
3828 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
3829 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
3830 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
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 /* 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
3833 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
3834
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3835 #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
3836 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
3837 {
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
3838 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
3839 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
3840 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
3841 }
28163
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
3842 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
3843 #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
3844
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 #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
3846 /* 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
3847 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
3848 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
3849 {
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 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
3851
20449
fc965930c738 (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 19184
diff changeset
3852 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
3853 {
21352
b9275822b6f5 (regex_compile) [!MATCH_MAY_ALLOCATE]: Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 21348
diff changeset
3854 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
3855
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3856 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
3857 fail_stack.stack
69039
f717c65a39d7 * regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 69038
diff changeset
3858 = (fail_stack_elt_t *) malloc (fail_stack.size
69073
9e57a1e7c532 Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 69039
diff changeset
3859 * 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
3860 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
3861 fail_stack.stack
69039
f717c65a39d7 * regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 69038
diff changeset
3862 = (fail_stack_elt_t *) realloc (fail_stack.stack,
69073
9e57a1e7c532 Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 69039
diff changeset
3863 (fail_stack.size
9e57a1e7c532 Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 69039
diff changeset
3864 * 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
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
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 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
3868 }
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 #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
3870
52680
3614833210ba (regex_compile): Free the stack when returning from function.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
3871 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
3872 } /* 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
3873
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 /* 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
3875
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
3876 /* 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
3877
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 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
3879 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
3880 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
3881 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
3882 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
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 *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
3885 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
3886 }
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
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 /* 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
3890
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 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
3892 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
3893 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
3894 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
3895 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
3896 {
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 *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
3898 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
3899 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
3900 }
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
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 /* 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
3904 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
3905
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 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
3907 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
3908 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
3909 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
3910 int arg;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
3911 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
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 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
3914 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
3915
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 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
3917 *--pto = *--pfrom;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
3918
11864
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 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
3920 }
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
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 /* 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
3924
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 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
3926 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
3927 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
3928 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
3929 int arg1, arg2;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
3930 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
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 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
3933 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
3934
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 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
3936 *--pto = *--pfrom;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
3937
11864
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 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
3939 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3940
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
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 /* 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
3943 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
3944 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
3945
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 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
3947 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
3948 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
3949 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
3950 {
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
3951 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
3952 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
3953
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3954 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
3955 /* 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
3956 (*prev == '(' && (syntax & RE_NO_BK_PARENS || prev_prev_backslash))
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3957 /* After an alternative? */
29194
fe06affca294 (at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28662
diff changeset
3958 || (*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
3959 /* After a shy subexpression? */
fe06affca294 (at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28662
diff changeset
3960 || ((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
3961 && prev[-1] == '?' && prev[-2] == '('
fe06affca294 (at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28662
diff changeset
3962 && (syntax & RE_NO_BK_PARENS
fe06affca294 (at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28662
diff changeset
3963 || (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
3964 }
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
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 /* 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
3968 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
3969
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3970 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
3971 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
3972 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
3973 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
3974 {
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
3975 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
3976 boolean next_backslash = *next == '\\';
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
3977 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
3978
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3979 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
3980 /* 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
3981 (syntax & RE_NO_BK_PARENS ? *next == ')'
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
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 /* 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
3984 || (syntax & RE_NO_BK_VBAR ? *next == '|'
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
3985 : 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
3986 }
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
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
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
3989 /* 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
3990 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
3991
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 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
3993 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
3994 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
3995 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
3996 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
3997 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
3998
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
3999 for (this_element = compile_stack.avail - 1;
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
4000 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
4001 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
4002 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
4003 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
4004
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4005 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
4006 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4007
28380
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4008 /* analyse_first.
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4009 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
4010 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
4011 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
4012 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
4013
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4014 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
4015 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
4016 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
4017
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4018 static int
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4019 analyse_first (p, pend, fastmap, multibyte)
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4020 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
4021 char *fastmap;
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4022 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
4023 {
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4024 int j, k;
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4025 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
4026
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4027 /* 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
4028 flag is set true. */
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4029 boolean match_any_multibyte_characters = false;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4030
28380
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4031 assert (p);
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
4032
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4033 /* 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
4034 - 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
4035 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
4036 - 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
4037 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
4038 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
4039 - 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
4040 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
4041 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
4042 (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
4043 worklist.
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4044 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
4045 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
4046 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
4047
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4048 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
4049 {
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4050 /* `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
4051 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
4052 (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
4053 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
4054 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
4055 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
4056 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
4057 as used for the *? operator. */
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4058 re_char *p1 = p;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
4059
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4060 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
4061 {
28380
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4062 case succeed:
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4063 return 1;
28380
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4064 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
4065
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4066 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
4067 /* 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
4068 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
4069 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
4070 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
4071 p++;
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4072 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
4073
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4074
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 /* Following are the cases which match a character. These end
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
4076 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
4077
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4078 case exactn:
30752
db737e34fc36 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 29801
diff changeset
4079 if (fastmap)
db737e34fc36 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 29801
diff changeset
4080 {
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
4081 /* 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
4082 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
4083 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
4084 cases. */
73056
2e2651f3d494 (analyse_first): For eight-bit-control chars, mark both the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72925
diff changeset
4085 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
4086 if (! multibyte)
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
4087 {
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
4088 /* 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
4089 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
4090 the corresponding multibyte character. */
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
4091 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
4092
106999
eb7555fbea3b regex.c (analyse_first): Fix setting of fastmap for unibyte pattern string.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
4093 fastmap[CHAR_LEADING_CODE (c)] = 1;
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
4094 }
30752
db737e34fc36 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 29801
diff changeset
4095 }
11864
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 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
4097
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4098
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4099 case anychar:
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4100 /* 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
4101 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
4102 if (!fastmap) break;
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4103 return -1;
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4104
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4105
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4106 case charset_not:
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4107 if (!fastmap) break;
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4108 {
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4109 /* 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
4110 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
4111 j < (1 << BYTEWIDTH); j++)
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4112 fastmap[j] = 1;
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4113 }
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4114
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4115 /* Fallthrough */
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4116 case charset:
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4117 if (!fastmap) break;
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4118 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
4119 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
4120 j >= 0; j--)
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4121 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
4122 fastmap[j] = 1;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4123
73056
2e2651f3d494 (analyse_first): For eight-bit-control chars, mark both the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72925
diff changeset
4124 #ifdef emacs
90790
385c9b28d8a7 (analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents: 90766
diff changeset
4125 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
4126 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
4127 not
385c9b28d8a7 (analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents: 90766
diff changeset
4128 ||
385c9b28d8a7 (analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents: 90766
diff changeset
4129 /* 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
4130 multibyte characters. */
385c9b28d8a7 (analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents: 90766
diff changeset
4131 (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
4132 && 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
4133
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4134 {
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4135 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
4136 {
90790
385c9b28d8a7 (analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents: 90766
diff changeset
4137 for (j = MIN_MULTIBYTE_LEADING_CODE;
385c9b28d8a7 (analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents: 90766
diff changeset
4138 j <= MAX_MULTIBYTE_LEADING_CODE; j++)
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
4139 fastmap[j] = 1;
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4140 match_any_multibyte_characters = true;
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 }
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4143
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4144 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
4145 && match_any_multibyte_characters == false)
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4146 {
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4147 /* 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
4148 multibyte characer in the range table. */
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4149 int c, count;
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4150 unsigned char lc1, lc2;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4151
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4152 /* 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
4153 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
4154 p += CHARSET_BITMAP_SIZE (&p[-2]) + 2;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4155
25877
9a7d8b436a5d 1999-09-04 Richard Stallman <rms@gnu.org>
Dave Love <fx@gnu.org>
parents: 25440
diff changeset
4156 /* 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
4157 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
4158 for (; count > 0; count--, p += 3)
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4159 {
88387
06da178fab0e * regex.c: Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 40650
diff changeset
4160 /* 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
4161 EXTRACT_CHARACTER (c, p);
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4162 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
4163 p += 3;
06da178fab0e * regex.c: Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 40650
diff changeset
4164 EXTRACT_CHARACTER (c, p);
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4165 lc2 = CHAR_LEADING_CODE (c);
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4166 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
4167 fastmap[j] = 1;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4168 }
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4169 }
90790
385c9b28d8a7 (analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents: 90766
diff changeset
4170 #endif
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4171 break;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4172
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4173 case syntaxspec:
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4174 case notsyntaxspec:
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4175 if (!fastmap) break;
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4176 #ifndef emacs
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4177 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
4178 k = *p++;
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4179 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
4180 if ((SYNTAX (j) == (enum syntaxcode) k) ^ not)
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4181 fastmap[j] = 1;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4182 break;
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4183 #else /* emacs */
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4184 /* 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
4185 aborting optimizations. */
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4186 return -1;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4187
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4188 case categoryspec:
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4189 case notcategoryspec:
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4190 if (!fastmap) break;
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4191 not = (re_opcode_t)p[-1] == notcategoryspec;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4192 k = *p++;
90790
385c9b28d8a7 (analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents: 90766
diff changeset
4193 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
4194 if ((CHAR_HAS_CATEGORY (j, k)) ^ not)
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4195 fastmap[j] = 1;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4196
90790
385c9b28d8a7 (analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents: 90766
diff changeset
4197 /* 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
4198 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
4199 if (match_any_multibyte_characters == false)
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
4200 {
90790
385c9b28d8a7 (analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents: 90766
diff changeset
4201 for (j = MIN_MULTIBYTE_LEADING_CODE;
385c9b28d8a7 (analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents: 90766
diff changeset
4202 j <= MAX_MULTIBYTE_LEADING_CODE; j++)
385c9b28d8a7 (analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents: 90766
diff changeset
4203 fastmap[j] = 1;
385c9b28d8a7 (analyse_first): Fix for multibyte characters in "case
Kenichi Handa <handa@m17n.org>
parents: 90766
diff changeset
4204 match_any_multibyte_characters = true;
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
4205 }
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4206 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
4207
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 /* All cases after this match the empty string. These end with
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4209 `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
4210
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 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
4212 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
4213 case after_dot:
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4214 #endif /* !emacs */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4215 case no_op:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4216 case begline:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4217 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
4218 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
4219 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
4220 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
4221 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
4222 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
4223 case wordend:
55690
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
4224 case symbeg:
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
4225 case symend:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4226 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
4227
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4228
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4229 case jump:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4230 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
4231 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
4232 /* 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
4233 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
4234 break;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
4235 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
4236 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
4237 {
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:
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4239 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
4240 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
4241 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
4242 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
4243 p++;
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4244 break;
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4245 default:
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4246 continue;
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4247 };
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4248 /* 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
4249 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
4250 /* Fallthrough */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4251
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4252 case on_failure_jump:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4253 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
4254 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
4255 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
4256 case on_failure_jump_smart:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4257 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
4258 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
4259 ; /* Backward jump to be ignored. */
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4260 else
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4261 { /* We have to look down both arms.
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4262 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
4263 stack usage when going through alternatives. */
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4264 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
4265 if (r) return r;
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4266 p += j;
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4267 }
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4268 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
4269
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4270
28372
bc86be15099e (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28342
diff changeset
4271 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
4272 /* 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
4273 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
4274 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
4275 /* 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
4276 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
4277 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
4278 continue;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49276
diff changeset
4279
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4280 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
4281 /* 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
4282 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
4283 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
4284 /* 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
4285 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
4286 on_failure_jump. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4287 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
4288
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4289
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4290 case set_number_at:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4291 p += 4;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4292 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
4293
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4294
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4295 case start_memory:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4296 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
4297 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
4298 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
4299
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4300
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4301 default:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4302 abort (); /* We have listed all the cases. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4303 } /* 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
4304
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4305 /* Getting here means we have found the possible starting
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4306 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
4307 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
4308 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
4309 } /* 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
4310
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4311 /* We reached the end without matching anything. */
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4312 return 1;
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4313
28380
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4314 } /* analyse_first */
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4315
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4316 /* 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
4317 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
4318 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
4319 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
4320
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4321 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
4322 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
4323 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
4324
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4325 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
4326 area as BUFP->fastmap.
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4327
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4328 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
4329 the pattern buffer.
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 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
4332
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4333 int
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4334 re_compile_fastmap (bufp)
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4335 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
4336 {
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4337 char *fastmap = bufp->fastmap;
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4338 int analysis;
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4339
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4340 assert (fastmap && bufp->buffer);
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4341
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
4342 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
4343 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
4344
5478842aea4c (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28372
diff changeset
4345 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
4346 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
4347 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
4348 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
4349 } /* 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
4350
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 /* 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
4352 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
4353 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
4354 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
4355 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
4356
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 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
4358 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
4359
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 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
4361 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
4362 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
4363
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 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
4365 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
4366 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
4367 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
4368 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
4369 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
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 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
4372 {
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 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
4374 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
4375 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
4376 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
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 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
4379 {
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 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
4381 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
4382 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
4383 }
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 }
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
4385 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
4386
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
4387 /* 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
4388
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 /* 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
4390 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
4391
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 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
4393 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
4394 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
4395 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
4396 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
4397 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
4398 {
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
4399 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
4400 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
4401 }
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
4402 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
4403
49276
f71131f142ff (GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents: 48424
diff changeset
4404 /* 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
4405 #define HEAD_ADDR_VSTRING(P) \
f71131f142ff (GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents: 48424
diff changeset
4406 (((P) >= size1 ? string2 : string1))
f71131f142ff (GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents: 48424
diff changeset
4407
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4408 /* End address of virtual concatenation of string. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4409 #define STOP_ADDR_VSTRING(P) \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4410 (((P) >= size1 ? string2 + size2 : string1 + size1))
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4411
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4412 /* 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
4413 #define POS_ADDR_VSTRING(POS) \
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4414 (((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
4415
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 /* 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
4417 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
4418 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
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 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
4421
11864
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 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
4423 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
4424 RANGE.
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
4425
11864
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 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
4427 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
4428 subexpressions.
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
4429
11864
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 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
4431 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
4432
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4433 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
4434 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
4435 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
4436
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 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
4438 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
4439 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
4440 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
4441 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
4442 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
4443 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
4444 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
4445 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
4446 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4447 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
4448 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
4449 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
4450 register char *fastmap = bufp->fastmap;
13250
52e053f46f76 (TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard M. Stallman <rms@gnu.org>
parents: 13100
diff changeset
4451 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
4452 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
4453 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
4454 boolean anchored_start;
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
4455 /* 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
4456 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
4457
11864
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 /* 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
4459 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
4460 return -1;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
4461
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4462 /* 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
4463 the virtual concatenation of STRING1 and STRING2.
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
4464 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
4465 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
4466 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
4467 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
4468 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
4469
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4470 /* 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
4471 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
4472 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
4473 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4474 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
4475 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
4476 else
21760
f97c01dfd603 (re_search_2): Fix handling of at_dot.
Richard M. Stallman <rms@gnu.org>
parents: 21562
diff changeset
4477 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
4478 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4479
12983
ed39ba26313b (re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents: 12931
diff changeset
4480 #ifdef emacs
ed39ba26313b (re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents: 12931
diff changeset
4481 /* 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
4482 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
4483 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
4484 {
21760
f97c01dfd603 (re_search_2): Fix handling of at_dot.
Richard M. Stallman <rms@gnu.org>
parents: 21562
diff changeset
4485 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
4486 if (range < 0)
12983
ed39ba26313b (re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents: 12931
diff changeset
4487 return -1;
ed39ba26313b (re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents: 12931
diff changeset
4488 }
ed39ba26313b (re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents: 12931
diff changeset
4489 #endif /* emacs */
ed39ba26313b (re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents: 12931
diff changeset
4490
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4491 /* 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
4492 if (fastmap && !bufp->fastmap_accurate)
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4493 re_compile_fastmap (bufp);
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
4494
16009
2a4da819f152 (re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents: 16008
diff changeset
4495 /* 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
4496 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
4497
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4498 #ifdef emacs
107366
14ff9accfbd3 Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107336
diff changeset
4499 gl_state.object = re_match_object; /* Used by SYNTAX_TABLE_BYTE_TO_CHAR. */
21482
9898a4994a12 (re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents: 21404
diff changeset
4500 {
28163
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
4501 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
4502
9898a4994a12 (re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents: 21404
diff changeset
4503 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
4504 }
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4505 #endif
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4506
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4507 /* 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
4508 for (;;)
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
4509 {
16009
2a4da819f152 (re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents: 16008
diff changeset
4510 /* If the pattern is anchored,
2a4da819f152 (re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents: 16008
diff changeset
4511 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
4512 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
4513 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
4514 if (anchored_start && startpos > 0)
2a4da819f152 (re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents: 16008
diff changeset
4515 {
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
4516 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
4517 : string2[startpos - size1 - 1])
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
4518 == '\n'))
16009
2a4da819f152 (re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents: 16008
diff changeset
4519 goto advance;
2a4da819f152 (re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents: 16008
diff changeset
4520 }
2a4da819f152 (re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents: 16008
diff changeset
4521
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4522 /* If a fastmap is supplied, skip quickly over characters that
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4523 cannot be the start of a match. If the pattern can match the
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4524 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
4525 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
4526 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
4527 {
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
4528 register re_char *d;
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4529 register re_wchar_t buf_ch;
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
4530
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
4531 d = POS_ADDR_VSTRING (startpos);
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
4532
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
4533 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
4534 {
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 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
4536 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
4537
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4538 if (startpos < size1 && startpos + range >= size1)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4539 lim = range - (size1 - startpos);
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4540
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4541 /* Written out as an if-else to avoid testing `translate'
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4542 inside the loop. */
21838
1d93b782b983 (re_search_2): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 21760
diff changeset
4543 if (RE_TRANSLATE_P (translate))
1d93b782b983 (re_search_2): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 21760
diff changeset
4544 {
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
4545 if (multibyte)
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
4546 while (range > lim)
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 int buf_charlen;
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
4549
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
4550 buf_ch = STRING_CHAR_AND_LENGTH (d, buf_charlen);
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
4551 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
4552 if (fastmap[CHAR_LEADING_CODE (buf_ch)])
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
4553 break;
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
4554
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
4555 range -= buf_charlen;
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
4556 d += buf_charlen;
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
4557 }
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
4558 else
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4559 while (range > lim)
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4560 {
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
4561 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
4562
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4563 buf_ch = *d;
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
4564 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
4565 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
4566 if (translated != ch
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
4567 && (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
4568 buf_ch = ch;
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
4569 if (fastmap[buf_ch])
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4570 break;
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4571 d++;
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4572 range--;
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
4573 }
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
4574 }
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4575 else
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
4576 {
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
4577 if (multibyte)
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
4578 while (range > lim)
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
4579 {
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
4580 int buf_charlen;
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
4581
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
4582 buf_ch = STRING_CHAR_AND_LENGTH (d, buf_charlen);
89455
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 {
89176
729d852f7419 (re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 89116
diff changeset
4599 if (multibyte)
729d852f7419 (re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 89116
diff changeset
4600 {
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
4601 buf_ch = STRING_CHAR (d);
89176
729d852f7419 (re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 89116
diff changeset
4602 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
4603 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
4604 goto advance;
729d852f7419 (re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 89116
diff changeset
4605 }
729d852f7419 (re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 89116
diff changeset
4606 else
729d852f7419 (re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 89116
diff changeset
4607 {
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
4608 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
4609
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
4610 buf_ch = *d;
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
4611 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
4612 translated = TRANSLATE (ch);
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
4613 if (translated != ch
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_UNIBYTE (translated)) >= 0)
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
4615 buf_ch = ch;
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
4616 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
4617 goto advance;
729d852f7419 (re_search_2): Fix for the case of unibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 89116
diff changeset
4618 }
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4619 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4620 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4621
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 /* 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
4623 if (range >= 0 && startpos == total_size && fastmap
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4624 && !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
4625 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
4626
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4627 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
4628 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
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 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
4631 return startpos;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
4632
11864
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 == -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
4634 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
4635
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 advance:
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
4637 if (!range)
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4638 break;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
4639 else if (range > 0)
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4640 {
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4641 /* Update STARTPOS to the next character boundary. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4642 if (multibyte)
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4643 {
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
4644 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
4645 re_char *pend = STOP_ADDR_VSTRING (startpos);
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4646 int len = MULTIBYTE_FORM_LENGTH (p, pend - p);
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4647
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4648 range -= len;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4649 if (range < 0)
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4650 break;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4651 startpos += len;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4652 }
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4653 else
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4654 {
18532
488df9d19f5e (re_search_2): Cast result of POS_ADDR_VSTRING.
Richard M. Stallman <rms@gnu.org>
parents: 18263
diff changeset
4655 range--;
488df9d19f5e (re_search_2): Cast result of POS_ADDR_VSTRING.
Richard M. Stallman <rms@gnu.org>
parents: 18263
diff changeset
4656 startpos++;
488df9d19f5e (re_search_2): Cast result of POS_ADDR_VSTRING.
Richard M. Stallman <rms@gnu.org>
parents: 18263
diff changeset
4657 }
16010
4addc35d079b Clean up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 16009
diff changeset
4658 }
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4659 else
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4660 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4661 range++;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4662 startpos--;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4663
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4664 /* Update STARTPOS to the previous character boundary. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4665 if (multibyte)
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4666 {
49276
f71131f142ff (GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents: 48424
diff changeset
4667 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
4668 re_char *p0 = p;
f71131f142ff (GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents: 48424
diff changeset
4669 re_char *phead = HEAD_ADDR_VSTRING (startpos);
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4670
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4671 /* 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
4672 PREV_CHAR_BOUNDARY (p, phead);
f71131f142ff (GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents: 48424
diff changeset
4673 range += p0 - 1 - p;
f71131f142ff (GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents: 48424
diff changeset
4674 if (range > 0)
f71131f142ff (GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents: 48424
diff changeset
4675 break;
f71131f142ff (GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents: 48424
diff changeset
4676
f71131f142ff (GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
Kenichi Handa <handa@m17n.org>
parents: 48424
diff changeset
4677 startpos -= p0 - 1 - p;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4678 }
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4679 }
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4680 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4681 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
4682 } /* re_search_2 */
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
4683 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
4684
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 /* 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
4686
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
4687 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
4688 register int len,
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
4689 RE_TRANSLATE_TYPE translate,
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
4690 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
4691
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4692 /* 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
4693 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
4694 #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
4695 (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
4696 ? ((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
4697 : ((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
4698
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4699 /* 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
4700 string2 if necessary.
d40a7f046efe (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28473
diff changeset
4701 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
4702 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
4703 #define PREFETCH() \
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4704 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
4705 { \
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 /* End of string2 => fail. */ \
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4707 if (dend == end_match_2) \
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4708 goto fail; \
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
4709 /* End of string1 => advance to string2. */ \
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4710 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
4711 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
4712 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4713
29296
b2c75746a989 (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29194
diff changeset
4714 /* 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
4715 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
4716 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
4717 outside of the LIMITs (i.e past `stop'). */
b2c75746a989 (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29194
diff changeset
4718 #define PREFETCH_NOLIMIT() \
b2c75746a989 (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29194
diff changeset
4719 if (d == end1) \
b2c75746a989 (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29194
diff changeset
4720 { \
b2c75746a989 (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29194
diff changeset
4721 d = string2; \
b2c75746a989 (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29194
diff changeset
4722 dend = end_match_2; \
b2c75746a989 (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29194
diff changeset
4723 } \
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4724
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4725 /* 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
4726 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
4727 #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
4728 #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
4729
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
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
4731 /* 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
4732 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
4733 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
4734 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
4735 #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
4736 (SYNTAX ((d) == end1 ? *string2 \
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4737 : (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
4738 == 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
4739
13722
e2669b8a46e2 (AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents: 13565
diff changeset
4740 /* 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
4741
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
4742 /* 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
4743 AT_WORD_BOUNDARY anymore to support multibyte form.
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 DEC Alpha C compiler 3.x generates incorrect code for the
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
4746 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
4747 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
4748 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
4749
13722
e2669b8a46e2 (AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents: 13565
diff changeset
4750 #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
4751 /* 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
4752 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
4753 #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
4754 (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
4755 || WORDCHAR_P (d - 1) != WORDCHAR_P (d))
13722
e2669b8a46e2 (AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents: 13565
diff changeset
4756 #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
4757
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 /* 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
4759 #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
4760 # 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
4761 # 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
4762 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
4763 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
4764 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
4765 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
4766 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
4767 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
4768 } 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
4769 #else
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
4770 # 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
4771 #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
4772
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4773
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4774 /* 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
4775
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4776 /* 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
4777 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
4778 static re_char *
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4779 skip_one_char (p)
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4780 re_char *p;
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4781 {
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4782 switch (SWITCH_ENUM_CAST (*p++))
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4783 {
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4784 case anychar:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4785 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49276
diff changeset
4786
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4787 case exactn:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4788 p += *p + 1;
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4789 break;
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4790
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4791 case charset_not:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4792 case charset:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4793 if (CHARSET_RANGE_TABLE_EXISTS_P (p - 1))
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4794 {
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4795 int mcnt;
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4796 p = CHARSET_RANGE_TABLE (p - 1);
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4797 EXTRACT_NUMBER_AND_INCR (mcnt, p);
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4798 p = CHARSET_RANGE_TABLE_END (p, mcnt);
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4799 }
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4800 else
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4801 p += 1 + CHARSET_BITMAP_SIZE (p - 1);
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4802 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49276
diff changeset
4803
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4804 case syntaxspec:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4805 case notsyntaxspec:
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
4806 #ifdef emacs
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4807 case categoryspec:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4808 case notcategoryspec:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4809 #endif /* emacs */
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4810 p++;
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4811 break;
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4812
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4813 default:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4814 p = NULL;
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 return p;
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4817 }
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
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4820 /* Jump over non-matching operations. */
52838
246c94760bee (MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents: 52680
diff changeset
4821 static re_char *
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4822 skip_noops (p, pend)
52838
246c94760bee (MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents: 52680
diff changeset
4823 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
4824 {
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4825 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
4826 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
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 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
4829 {
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4830 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
4831 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
4832 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
4833 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
4834 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
4835 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
4836 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
4837 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
4838 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
4839 break;
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4840 default:
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4841 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
4842 }
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4843 }
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4844 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
4845 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
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
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4848 /* 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
4849 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
4850 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
4851 struct re_pattern_buffer *bufp;
52838
246c94760bee (MAX_BUF_SIZE): Reduce to 2**15.
Richard M. Stallman <rms@gnu.org>
parents: 52680
diff changeset
4852 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
4853 {
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4854 re_opcode_t op2;
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
4855 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
4856 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
4857
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4858 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
4859 && 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
4860
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4861 /* 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
4862 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
4863 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
4864 match at least one of that. */
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4865 p2 = skip_noops (p2, pend);
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4866 /* 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
4867 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
4868 /* p1 = skip_noops (p1, pend); */
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4869
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4870 assert (p1 >= bufp->buffer && p1 < pend
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4871 && p2 >= bufp->buffer && p2 <= 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 op2 = p2 == pend ? succeed : *p2;
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4874
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4875 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
4876 {
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4877 case succeed:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4878 case endbuf:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4879 /* 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
4880 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
4881 {
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4882 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
4883 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
4884 }
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4885 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49276
diff changeset
4886
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4887 case endline:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4888 case exactn:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4889 {
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
4890 register re_wchar_t c
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4891 = (re_opcode_t) *p2 == endline ? '\n'
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
4892 : RE_STRING_CHAR (p2 + 2, multibyte);
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4893
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4894 if ((re_opcode_t) *p1 == exactn)
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4895 {
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
4896 if (c != RE_STRING_CHAR (p1 + 2, multibyte))
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4897 {
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4898 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
4899 return 1;
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 }
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4902
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4903 else if ((re_opcode_t) *p1 == charset
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4904 || (re_opcode_t) *p1 == charset_not)
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 int not = (re_opcode_t) *p1 == charset_not;
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4907
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4908 /* 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
4909 at `p1'. */
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
4910 if (! multibyte || IS_REAL_ASCII (c))
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4911 {
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4912 if (c < CHARSET_BITMAP_SIZE (p1) * BYTEWIDTH
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4913 && p1[2 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH)))
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4914 not = !not;
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4915 }
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4916 else if (CHARSET_RANGE_TABLE_EXISTS_P (p1))
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4917 CHARSET_LOOKUP_RANGE_TABLE (not, c, p1);
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 /* `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
4920 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
4921 if (!not)
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4922 {
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4923 DEBUG_PRINT1 (" No match => fast loop.\n");
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4924 return 1;
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 }
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4927 else if ((re_opcode_t) *p1 == anychar
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4928 && c == '\n')
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 DEBUG_PRINT1 (" . != \\n => fast loop.\n");
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4931 return 1;
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 }
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4934 break;
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 case charset:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4937 {
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4938 if ((re_opcode_t) *p1 == exactn)
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4939 /* Reuse the code above. */
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4940 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
4941
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4942 /* 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
4943 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
4944 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
4945 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
4946 {
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4947 /* 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
4948 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
4949 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
4950 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
4951 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
4952
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
4953 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
4954 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
4955 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
4956 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
4957
35525
95c2eedea354 (mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33066
diff changeset
4958 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
4959 {
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4960 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
4961 /* 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
4962 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
4963 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
4964 (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
4965 && 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
4966 idx++)
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4967 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
4968 break;
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4969
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 (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
4971 || 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
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 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
4974 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
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 }
35525
95c2eedea354 (mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33066
diff changeset
4977 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
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 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
4980 /* We win if the charset_not inside the loop lists
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
4981 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
4982 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
4983 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
4984 || (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
4985 && ((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
4986 break;
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
4987
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4988 if (idx == p2[1])
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4989 {
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4990 DEBUG_PRINT1 (" No match => fast loop.\n");
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4991 return 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 }
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4994 }
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
4995 }
35533
6bd789b0ccc3 (mutually_exclusive_p): Add missing `break' at the end of `charset' processing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 35525
diff changeset
4996 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49276
diff changeset
4997
35525
95c2eedea354 (mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33066
diff changeset
4998 case charset_not:
95c2eedea354 (mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33066
diff changeset
4999 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
5000 {
95c2eedea354 (mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33066
diff changeset
5001 case exactn:
95c2eedea354 (mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33066
diff changeset
5002 case charset:
95c2eedea354 (mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33066
diff changeset
5003 /* Reuse the code above. */
95c2eedea354 (mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33066
diff changeset
5004 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
5005 case charset_not:
95c2eedea354 (mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33066
diff changeset
5006 /* 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
5007 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
5008 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
5009 fact, is virtually impossible in multibyte buffers. */
47008
c299d527a088 (PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44145
diff changeset
5010 break;
35525
95c2eedea354 (mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33066
diff changeset
5011 }
95c2eedea354 (mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33066
diff changeset
5012 break;
95c2eedea354 (mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33066
diff changeset
5013
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5014 case wordend:
55690
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
5015 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
5016 case symend:
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5017 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
5018 && (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
5019 case notsyntaxspec:
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
5020 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
5021
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5022 case wordbeg:
55690
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 == notsyntaxspec && p1[1] == Sword);
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
5024 case symbeg:
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5025 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
5026 && (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
5027 case syntaxspec:
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
5028 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
5029
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5030 case wordbound:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5031 return (((re_opcode_t) *p1 == notsyntaxspec
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5032 || (re_opcode_t) *p1 == syntaxspec)
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5033 && p1[1] == Sword);
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5034
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
5035 #ifdef emacs
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5036 case categoryspec:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5037 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
5038 case notcategoryspec:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5039 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
5040 #endif /* emacs */
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5041
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5042 default:
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5043 ;
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
5044 }
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
5045
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
5046 /* 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
5047 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
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
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5050
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5051 /* 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
5052
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5053 #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
5054 /* 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
5055
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5056 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
5057 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
5058 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
5059 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
5060 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
5061 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
5062 {
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
5063 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
5064 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
5065 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
5066 }
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
5067 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
5068 #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
5069
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5070 #ifdef emacs
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5071 /* 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
5072 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
5073 Lisp_Object re_match_object;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5074 #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
5075
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5076 /* 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
5077 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
5078 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
5079 matching at STOP.
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
5080
11864
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 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
5082 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
5083 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
5084
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5085 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
5086 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
5087 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
5088
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5089 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
5090 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
5091 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
5092 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
5093 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
5094 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
5095 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
5096 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
5097 {
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5098 int result;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5099
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5100 #ifdef emacs
21482
9898a4994a12 (re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents: 21404
diff changeset
5101 int charpos;
107366
14ff9accfbd3 Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107336
diff changeset
5102 gl_state.object = re_match_object; /* Used by SYNTAX_TABLE_BYTE_TO_CHAR. */
28163
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
5103 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
5104 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
5105 #endif
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5106
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
5107 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
5108 (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
5109 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
5110 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
5111 }
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
5112 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
5113
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
5114
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5115 /* 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
5116 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
5117 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
5118 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
5119 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
5120 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
5121 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
5122 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
5123 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
5124 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
5125 {
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 /* 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
5127 int mcnt;
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5128 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
5129 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
5130
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5131 /* 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
5132 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
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 /* 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
5135 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
5136 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
5137
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5138 /* 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
5139 re_char *d, *dend;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
5140
28163
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
5141 /* 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
5142 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
5143 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
5144 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
5145 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
5146
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5147 /* 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
5148 re_char *p = bufp->buffer;
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5149 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
5150
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5151 /* 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
5152 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
5153
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5154 /* 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
5155 const boolean multibyte = RE_MULTIBYTE_P (bufp);
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
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 STRING1/STRING2 are multibyte. */
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5158 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
5159
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5160 /* 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
5161 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
5162 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
5163 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
5164 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
5165 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
5166 scanning the strings. */
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
5167 #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
5168 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
5169 #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
5170 #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
5171 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
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
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
5174 #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
5175 /* 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
5176 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
5177 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
5178 #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
5179
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 /* We fill all the registers internally, independent of what we
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
5181 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
5182 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
5183 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
5184
11864
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 /* 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
5186 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
5187 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
5188 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
5189 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
5190 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
5191 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
5192 #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
5193 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
5194 #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
5195
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5196 /* 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
5197 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
5198 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
5199 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
5200 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
5201 #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
5202 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
5203 #endif
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
5204
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5205 /* 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
5206 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
5207 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
5208 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
5209 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
5210 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
5211 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
5212 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
5213 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
5214
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 #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
5216 /* Counts the total number of registers pushed. */
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
5217 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
5218 #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
5219
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5220 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
5221
11864
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 INIT_FAIL_STACK ();
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
5223
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5224 #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
5225 /* 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
5226 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
5227 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
5228 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
5229 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
5230 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
5231 {
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
5232 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
5233 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
5234 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
5235 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
5236
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
5237 if (!(regstart && regend && best_regstart && best_regend))
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5238 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5239 FREE_VARIABLES ();
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5240 return -2;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5241 }
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5242 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5243 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
5244 {
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 /* We must initialize all our variables to NULL, so that
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5246 `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
5247 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
5248 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5249 #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
5250
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 /* 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
5252 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
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 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
5255 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
5256 }
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
5257
11864
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 /* 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
5259 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
5260 register information struct. */
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5261 for (reg = 1; reg < num_regs; reg++)
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5262 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
5263
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5264 /* 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
5265 `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
5266 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
5267 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5268 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
5269 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
5270 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
5271 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
5272 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5273 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
5274 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
5275
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
5276 /* `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
5277 `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
5278 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
5279 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
5280 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
5281 equal `string2'. */
28662
d40a7f046efe (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28473
diff changeset
5282 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
5283 {
28662
d40a7f046efe (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28473
diff changeset
5284 /* 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
5285 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
5286 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
5287 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
5288 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5289 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
5290 {
29296
b2c75746a989 (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29194
diff changeset
5291 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
5292 {
d40a7f046efe (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28473
diff changeset
5293 /* 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
5294 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
5295 /* BEWARE!
d40a7f046efe (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28473
diff changeset
5296 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
5297 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
5298 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
5299 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
5300 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
5301 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
5302 end_match_2). */
d40a7f046efe (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28473
diff changeset
5303 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
5304 }
d40a7f046efe (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28473
diff changeset
5305 else
29296
b2c75746a989 (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29194
diff changeset
5306 { /* 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
5307 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
5308 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
5309 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
5310 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
5311 }
d40a7f046efe (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28473
diff changeset
5312 d = string1 + pos;
d40a7f046efe (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28473
diff changeset
5313 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
5314 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5315
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5316 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
5317 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
5318 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
5319 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
5320 DEBUG_PRINT1 ("'\n");
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
5321
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
5322 /* 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
5323 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
5324 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
5325 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
5326 {
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
5327 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
5328
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 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
5330 { /* End of pattern means we might have succeeded. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5331 DEBUG_PRINT1 ("end of pattern ... ");
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
5332
11864
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 /* If we haven't matched the entire string, and we want the
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5334 longest match, try backtracking. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5335 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
5336 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5337 /* 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
5338 as the best previous match. */
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
5339 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
5340 == 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
5341 /* 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
5342 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
5343
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 /* AIX compiler got confused when this was combined
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
5345 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
5346 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
5347 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
5348 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
5349 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
5350
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5351 DEBUG_PRINT1 ("backtracking.\n");
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5352
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5353 if (!FAIL_STACK_EMPTY ())
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5354 { /* More failure points to try. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5355
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5356 /* If exceeds best match so far, save it. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5357 if (!best_regs_set || best_match_p)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5358 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5359 best_regs_set = true;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5360 match_end = d;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5361
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5362 DEBUG_PRINT1 ("\nSAVING match as best so far.\n");
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5363
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5364 for (reg = 1; reg < num_regs; reg++)
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5365 {
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5366 best_regstart[reg] = regstart[reg];
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5367 best_regend[reg] = regend[reg];
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5368 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5369 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5370 goto fail;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5371 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5372
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5373 /* If no failure points, don't restore garbage. And if
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5374 last match is real best match, don't restore second
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5375 best one. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5376 else if (best_regs_set && !best_match_p)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5377 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5378 restore_best_regs:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5379 /* Restore best match. It may happen that `dend ==
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5380 end_match_1' while the restored d is in string2.
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5381 For example, the pattern `x.*y.*z' against the
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5382 strings `x-' and `y-z-', if the two strings are
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
5383 not consecutive in memory. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5384 DEBUG_PRINT1 ("Restoring best registers.\n");
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5385
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5386 d = match_end;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5387 dend = ((d >= string1 && d <= end1)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5388 ? 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
5389
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5390 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
5391 {
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5392 regstart[reg] = best_regstart[reg];
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5393 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
5394 }
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5395 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5396 } /* 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
5397
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5398 succeed_label:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5399 DEBUG_PRINT1 ("Accepting match.\n");
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5400
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5401 /* If caller wants register contents data back, do it. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5402 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
5403 {
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5404 /* Have the register data arrays been allocated? */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5405 if (bufp->regs_allocated == REGS_UNALLOCATED)
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
5406 { /* No. So allocate them with malloc. We need one
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5407 extra element beyond `num_regs' for the `-1' marker
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5408 GNU code uses. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5409 regs->num_regs = MAX (RE_NREGS, num_regs + 1);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5410 regs->start = TALLOC (regs->num_regs, regoff_t);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5411 regs->end = TALLOC (regs->num_regs, regoff_t);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5412 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
5413 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5414 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
5415 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
5416 }
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5417 bufp->regs_allocated = REGS_REALLOCATE;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5418 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5419 else if (bufp->regs_allocated == REGS_REALLOCATE)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5420 { /* Yes. If we need more elements than were already
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5421 allocated, reallocate them. If we need fewer, just
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5422 leave it alone. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5423 if (regs->num_regs < num_regs + 1)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5424 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5425 regs->num_regs = num_regs + 1;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5426 RETALLOC (regs->start, regs->num_regs, regoff_t);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5427 RETALLOC (regs->end, regs->num_regs, regoff_t);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5428 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
5429 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5430 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
5431 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
5432 }
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5433 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5434 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5435 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
5436 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5437 /* 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
5438 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
5439 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
5440 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5441
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5442 /* Convert the pointer data in `regstart' and `regend' to
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5443 indices. Register zero has to be set differently,
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5444 since we haven't kept track of any info for it. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5445 if (regs->num_regs > 0)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5446 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5447 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
5448 regs->end[0] = POINTER_TO_OFFSET (d);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5449 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5450
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5451 /* Go through the first `min (num_regs, regs->num_regs)'
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5452 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
5453 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
5454 {
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5455 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
5456 regs->start[reg] = regs->end[reg] = -1;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5457 else
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5458 {
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5459 regs->start[reg]
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5460 = (regoff_t) POINTER_TO_OFFSET (regstart[reg]);
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5461 regs->end[reg]
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5462 = (regoff_t) POINTER_TO_OFFSET (regend[reg]);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5463 }
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5464 }
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
5465
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5466 /* If the regs structure we return has more elements than
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5467 were in the pattern, set the extra elements to -1. If
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5468 we (re)allocated the registers, this is the case,
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5469 because we always allocate enough to have at least one
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
5470 -1 at the end. */
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5471 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
5472 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
5473 } /* 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
5474
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5475 DEBUG_PRINT4 ("%u failure points pushed, %u popped (%u remain).\n",
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5476 nfailure_points_pushed, nfailure_points_popped,
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5477 nfailure_points_pushed - nfailure_points_popped);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5478 DEBUG_PRINT2 ("%u registers pushed.\n", num_regs_pushed);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5479
28163
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
5480 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
5481
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5482 DEBUG_PRINT2 ("Returning %d from re_match_2.\n", mcnt);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5483
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5484 FREE_VARIABLES ();
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5485 return mcnt;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5486 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5487
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
5488 /* 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
5489 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
5490 {
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5491 /* Ignore these. Used to ignore the n of succeed_n's which
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5492 currently have n == 0. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5493 case no_op:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5494 DEBUG_PRINT1 ("EXECUTING no_op.\n");
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5495 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
5496
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5497 case succeed:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5498 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
5499 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
5500
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
5501 /* Match the next n pattern characters exactly. The following
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5502 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
5503 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
5504 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
5505 mcnt = *p++;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5506 DEBUG_PRINT2 ("EXECUTING exactn %d.\n", mcnt);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5507
28163
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
5508 /* 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
5509 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
5510
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5511 #ifndef emacs
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5512 /* This is written out as an if-else so we don't waste time
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5513 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
5514 if (RE_TRANSLATE_P (translate))
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5515 do
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5516 {
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5517 PREFETCH ();
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5518 if (RE_TRANSLATE (translate, *d) != *p++)
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5519 {
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5520 d = dfail;
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5521 goto fail;
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++;
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5524 }
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5525 while (--mcnt);
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5526 else
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5527 do
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5528 {
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5529 PREFETCH ();
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5530 if (*d++ != *p++)
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5531 {
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5532 d = dfail;
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5533 goto fail;
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 }
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5536 while (--mcnt);
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5537 #else /* emacs */
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5538 /* 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
5539 if (target_multibyte)
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5540 do
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5541 {
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5542 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
5543 int pat_ch, buf_ch;
89455
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 PREFETCH ();
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5546 if (multibyte)
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
5547 pat_ch = STRING_CHAR_AND_LENGTH (p, pat_charlen);
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5548 else
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5549 {
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5550 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
5551 pat_charlen = 1;
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5552 }
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
5553 buf_ch = STRING_CHAR_AND_LENGTH (d, buf_charlen);
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5554
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5555 if (TRANSLATE (buf_ch) != pat_ch)
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5556 {
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5557 d = dfail;
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5558 goto fail;
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
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5561 p += pat_charlen;
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5562 d += buf_charlen;
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5563 mcnt -= pat_charlen;
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5564 }
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5565 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
5566 else
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5567 do
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5568 {
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5569 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
5570 int pat_ch, buf_ch;
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5571
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5572 PREFETCH ();
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5573 if (multibyte)
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5574 {
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
5575 pat_ch = STRING_CHAR_AND_LENGTH (p, pat_charlen);
95856
f13a77e0e34f * character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95479
diff changeset
5576 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
5577 }
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5578 else
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5579 {
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5580 pat_ch = *p;
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5581 pat_charlen = 1;
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5582 }
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5583 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
5584 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
5585 {
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5586 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
5587 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
5588 if (buf_ch < 0)
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5589 buf_ch = *d;
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5590 }
92979
7967dd572109 (re_match_2_internal): Correct matching of eight bit
Andreas Schwab <schwab@suse.de>
parents: 91804
diff changeset
5591 else
7967dd572109 (re_match_2_internal): Correct matching of eight bit
Andreas Schwab <schwab@suse.de>
parents: 91804
diff changeset
5592 buf_ch = *d;
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5593 if (buf_ch != pat_ch)
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5594 {
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5595 d = dfail;
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5596 goto fail;
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5597 }
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5598 p += pat_charlen;
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5599 d++;
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5600 }
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5601 while (--mcnt);
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
5602 #endif
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5603 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5604
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5605
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5606 /* 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
5607 case anychar:
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5608 {
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5609 int buf_charlen;
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5610 re_wchar_t buf_ch;
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5611
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5612 DEBUG_PRINT1 ("EXECUTING anychar.\n");
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5613
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5614 PREFETCH ();
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
5615 buf_ch = RE_STRING_CHAR_AND_LENGTH (d, buf_charlen,
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5616 target_multibyte);
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5617 buf_ch = TRANSLATE (buf_ch);
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5618
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5619 if ((!(bufp->syntax & RE_DOT_NEWLINE)
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5620 && buf_ch == '\n')
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5621 || ((bufp->syntax & RE_DOT_NOT_NULL)
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5622 && buf_ch == '\000'))
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5623 goto fail;
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5624
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5625 DEBUG_PRINT2 (" Matched `%d'.\n", *d);
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5626 d += buf_charlen;
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
5627 }
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5628 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
5629
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5630
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5631 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
5632 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
5633 {
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5634 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
5635 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
5636 int len;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5637
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5638 /* 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
5639 range table. */
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
5640 re_char *range_table;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5641
25440
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5642 /* Nonzero if there is a range table. */
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5643 int range_table_exists;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5644
25440
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5645 /* 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
5646 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
5647 int count = 0;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5648
93006
72213c342fe7 (re_match_2_internal): Correct matching of a charset
Andreas Schwab <schwab@suse.de>
parents: 92979
diff changeset
5649 /* Whether matching against a unibyte character. */
72213c342fe7 (re_match_2_internal): Correct matching of a charset
Andreas Schwab <schwab@suse.de>
parents: 92979
diff changeset
5650 boolean unibyte_char = false;
72213c342fe7 (re_match_2_internal): Correct matching of a charset
Andreas Schwab <schwab@suse.de>
parents: 92979
diff changeset
5651
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5652 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
5653
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5654 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
5655
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5656 if (range_table_exists)
25440
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5657 {
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5658 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
5659 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
5660 }
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5661
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
5662 PREFETCH ();
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
5663 c = RE_STRING_CHAR_AND_LENGTH (d, len, target_multibyte);
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5664 if (target_multibyte)
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5665 {
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5666 int c1;
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5667
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5668 c = TRANSLATE (c);
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5669 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
5670 if (c1 >= 0)
93006
72213c342fe7 (re_match_2_internal): Correct matching of a charset
Andreas Schwab <schwab@suse.de>
parents: 92979
diff changeset
5671 {
72213c342fe7 (re_match_2_internal): Correct matching of a charset
Andreas Schwab <schwab@suse.de>
parents: 92979
diff changeset
5672 unibyte_char = true;
72213c342fe7 (re_match_2_internal): Correct matching of a charset
Andreas Schwab <schwab@suse.de>
parents: 92979
diff changeset
5673 c = c1;
72213c342fe7 (re_match_2_internal): Correct matching of a charset
Andreas Schwab <schwab@suse.de>
parents: 92979
diff changeset
5674 }
90757
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 else
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 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
5679
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5680 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
5681 {
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5682 c1 = TRANSLATE (c1);
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5683 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
5684 if (c1 >= 0)
93006
72213c342fe7 (re_match_2_internal): Correct matching of a charset
Andreas Schwab <schwab@suse.de>
parents: 92979
diff changeset
5685 {
72213c342fe7 (re_match_2_internal): Correct matching of a charset
Andreas Schwab <schwab@suse.de>
parents: 92979
diff changeset
5686 unibyte_char = true;
72213c342fe7 (re_match_2_internal): Correct matching of a charset
Andreas Schwab <schwab@suse.de>
parents: 92979
diff changeset
5687 c = c1;
72213c342fe7 (re_match_2_internal): Correct matching of a charset
Andreas Schwab <schwab@suse.de>
parents: 92979
diff changeset
5688 }
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5689 }
93033
408f1bfeb7e8 (re_match_2_internal): Properly match raw 8-bit bytes
Andreas Schwab <schwab@suse.de>
parents: 93006
diff changeset
5690 else
408f1bfeb7e8 (re_match_2_internal): Properly match raw 8-bit bytes
Andreas Schwab <schwab@suse.de>
parents: 93006
diff changeset
5691 unibyte_char = true;
90757
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5692 }
8780137cabbc (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
5693
93006
72213c342fe7 (re_match_2_internal): Correct matching of a charset
Andreas Schwab <schwab@suse.de>
parents: 92979
diff changeset
5694 if (unibyte_char && c < (1 << BYTEWIDTH))
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5695 { /* Lookup bitmap. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5696 /* Cast to `unsigned' instead of `unsigned char' in
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5697 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
5698 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
5699 && 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
5700 not = !not;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5701 }
25440
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5702 #ifdef emacs
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5703 else if (range_table_exists)
25440
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5704 {
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5705 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
5706
31360
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
5707 if ( (class_bits & BIT_LOWER && ISLOWER (c))
b8513fe83893 (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31312
diff changeset
5708 | (class_bits & BIT_MULTIBYTE)
25440
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5709 | (class_bits & BIT_PUNCT && ISPUNCT (c))
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5710 | (class_bits & BIT_SPACE && ISSPACE (c))
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5711 | (class_bits & BIT_UPPER && ISUPPER (c))
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5712 | (class_bits & BIT_WORD && ISWORD (c)))
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5713 not = !not;
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 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
5716 }
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5717 #endif /* emacs */
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5718
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5719 if (range_table_exists)
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5720 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
5721 else
0a1099580297 [emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents: 24119
diff changeset
5722 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
5723
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5724 if (!not) goto fail;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
5725
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
5726 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
5727 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
5728 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5729
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5730
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5731 /* 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
5732 The argument is the register number. The text
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5733 matched within the group is recorded (in the internal
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
5734 registers data structure) under the register number. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5735 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
5736 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
5737
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
5738 /* 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
5739 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
5740
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5741 regstart[*p] = d;
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
5742 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
5743 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
5744
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5745 /* 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
5746 p += 1;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5747 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5748
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5749
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5750 /* 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
5751 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
5752 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
5753 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
5754
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
5755 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
5756 /* Strictly speaking, there should be code such as:
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49276
diff changeset
5757
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
5758 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
5759 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
5760
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
5761 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
5762 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
5763 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
5764 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
5765 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
5766 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
5767 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
5768 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
5769
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5770 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
5771 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
5772
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5773 /* 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
5774 p += 1;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5775 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
5776
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
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 /* \<digit> has been turned into a `duplicate' command which is
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5779 followed by the numeric value of <digit> as the register number. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5780 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
5781 {
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
5782 register re_char *d2, *dend2;
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
5783 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
5784 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
5785
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
5786 /* Can't back reference a group which we've never matched. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5787 if (REG_UNSET (regstart[regno]) || REG_UNSET (regend[regno]))
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5788 goto fail;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5789
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
5790 /* Where in input to try to start matching. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5791 d2 = regstart[regno];
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5792
28163
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
5793 /* 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
5794 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
5795
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5796 /* Where to stop matching; if both the place to start and
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5797 the place to stop matching are in the same string, then
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5798 set to the place to stop, otherwise, for now have to use
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5799 the end of the first string. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5800
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5801 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
5802 == 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
5803 ? 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
5804 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
5805 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5806 /* If necessary, advance to next segment in register
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5807 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
5808 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
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 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
5811 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
5812
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5813 /* End of string1 => advance to string2. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5814 d2 = string2;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5815 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
5816 }
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 /* 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
5818 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
5819
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5820 /* 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
5821 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
5822
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5823 /* 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
5824 mcnt = dend - d;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
5825
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5826 /* Want how many consecutive characters we can match in
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5827 one shot, so, if necessary, adjust the count. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5828 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
5829 mcnt = dend2 - d2;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
5830
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5831 /* Compare that many; failure if mismatch, else move
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5832 past them. */
21562
afd0a04106ec Use RE_TRANSLATE_P to check whether translation is
Andreas Schwab <schwab@suse.de>
parents: 21558
diff changeset
5833 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
5834 ? 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
5835 : 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
5836 {
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
5837 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
5838 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
5839 }
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5840 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
5841 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5842 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5843 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
5844
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5845
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5846 /* 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
5847 (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
5848 case begline:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5849 DEBUG_PRINT1 ("EXECUTING begline.\n");
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5850
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5851 if (AT_STRINGS_BEG (d))
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5852 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5853 if (!bufp->not_bol) break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5854 }
28662
d40a7f046efe (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28473
diff changeset
5855 else
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5856 {
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
5857 unsigned c;
28662
d40a7f046efe (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28473
diff changeset
5858 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
5859 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
5860 break;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5861 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5862 /* In all other cases, we fail. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5863 goto fail;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5864
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5865
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5866 /* 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
5867 case endline:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5868 DEBUG_PRINT1 ("EXECUTING endline.\n");
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5869
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5870 if (AT_STRINGS_END (d))
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5871 {
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5872 if (!bufp->not_eol) break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5873 }
29296
b2c75746a989 (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29194
diff changeset
5874 else
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5875 {
29296
b2c75746a989 (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29194
diff changeset
5876 PREFETCH_NOLIMIT ();
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
5877 if (*d == '\n')
29296
b2c75746a989 (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29194
diff changeset
5878 break;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5879 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5880 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
5881
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5882
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 /* Match at the very beginning of the data. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5884 case begbuf:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5885 DEBUG_PRINT1 ("EXECUTING begbuf.\n");
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5886 if (AT_STRINGS_BEG (d))
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5887 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5888 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
5889
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5890
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5891 /* Match at the very end of the data. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5892 case endbuf:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5893 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
5894 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
5895 break;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5896 goto fail;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5897
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5898
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5899 /* on_failure_keep_string_jump is used to optimize `.*\n'. It
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5900 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
5901 `POP_FAILURE_POINT' will keep the current value for the
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5902 string, instead of restoring it. To see why, consider
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
5903 matching `foo\nbar' against `.*\n'. The .* matches the foo;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5904 then the . fails against the \n. But the next thing we want
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5905 to do is match the \n against the \n; if we restored the
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5906 string value, we would be back at the foo.
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5907
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5908 Because this is used only in specific cases, we don't need to
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5909 check all the things that `on_failure_jump' does, to make
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5910 sure the right things get saved on the stack. Hence we don't
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5911 share its code. The only reason to push anything on the
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5912 stack at all is that otherwise we would have to change
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5913 `anychar's code to do something besides goto fail in this
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5914 case; that seems worse than this. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5915 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
5916 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
5917 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
5918 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
5919
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
5920 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
5921 break;
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
5922
28342
9761cf2351fa (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28279
diff changeset
5923 /* 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
5924 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
5925 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
5926 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
5927 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
5928 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
5929 loop).
28342
9761cf2351fa (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28279
diff changeset
5930 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
5931 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
5932 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
5933 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
5934 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
5935 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
5936 the loop. */
9761cf2351fa (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28279
diff changeset
5937 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
5938 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
5939 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
5940 mcnt, p + mcnt);
9761cf2351fa (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28279
diff changeset
5941
9761cf2351fa (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28279
diff changeset
5942 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
5943 {
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
5944 int cycle = 0;
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
5945 CHECK_INFINITE_LOOP (p - 4, d);
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
5946 if (!cycle)
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
5947 /* 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
5948 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
5949 option, which shouldn't be tried.
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
5950 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
5951 PUSH_FAILURE_POINT (p - 3, d);
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
5952 }
28342
9761cf2351fa (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28279
diff changeset
5953 break;
9761cf2351fa (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28279
diff changeset
5954
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5955 /* 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
5956 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
5957 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
5958 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
5959 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
5960 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
5961 mcnt, p + mcnt);
47368
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
5962 {
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
5963 int cycle = 0;
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
5964 CHECK_INFINITE_LOOP (p - 3, d);
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
5965 if (cycle)
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
5966 /* 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
5967 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
5968 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
5969 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
5970 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
5971 p += mcnt;
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
5972 else
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
5973 PUSH_FAILURE_POINT (p - 3, d);
3f5cad2781e7 (DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47337
diff changeset
5974 }
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5975 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
5976
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5977
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
5978 /* Uses of on_failure_jump:
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
5979
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5980 Each alternative starts with an on_failure_jump that points
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5981 to the beginning of the next alternative. Each alternative
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5982 except the last ends with a jump that in effect jumps past
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5983 the rest of the alternatives. (They really jump to the
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5984 ending jump of the following alternative, because tensioning
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5985 these jumps is a hassle.)
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5986
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5987 Repeats start with an on_failure_jump that points past both
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5988 the repetition text and either the following jump or
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5989 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
5990 case on_failure_jump:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5991 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
5992 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
5993 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
5994
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
5995 PUSH_FAILURE_POINT (p -3, d);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5996 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
5997
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
5998 /* 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
5999 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
6000 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
6001 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
6002 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
6003 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
6004 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
6005 case on_failure_jump_smart:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6006 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
6007 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
6008 mcnt, p + mcnt);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6009 {
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6010 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
6011 /* 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
6012 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
6013 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
6014
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
6015 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
6016 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
6017
28203
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
6018 EXTRACT_NUMBER (mcnt, p2 - 2);
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
6019
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
6020 /* 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
6021 we are expecting. */
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
6022 assert (skip_one_char (p1) == p2 - 3);
c10ee0e6982b (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28163
diff changeset
6023 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
6024 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
6025 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
6026 {
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
6027 /* 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
6028 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
6029 *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
6030 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
6031 }
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
6032 else
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
6033 {
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
6034 /* 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
6035 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
6036 *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
6037 }
28163
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
6038 DEBUG_STATEMENT (debug -= 2);
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6039 }
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
6040 break;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6041
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6042 /* Unconditionally jump (without popping any failure points). */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6043 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
6044 unconditional_jump:
32823
2a7f61d7ae12 (IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents: 32805
diff changeset
6045 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
6046 EXTRACT_NUMBER_AND_INCR (mcnt, p); /* Get the amount to jump. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6047 DEBUG_PRINT2 ("EXECUTING jump %d ", mcnt);
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
6048 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
6049 DEBUG_PRINT2 ("(to %p).\n", p);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6050 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6051
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6052
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6053 /* Have to succeed matching what follows at least n times.
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6054 After that, handle like `on_failure_jump'. */
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6055 case succeed_n:
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6056 /* Signedness doesn't matter since we only compare MCNT to 0. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6057 EXTRACT_NUMBER (mcnt, p + 2);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6058 DEBUG_PRINT2 ("EXECUTING succeed_n %d.\n", mcnt);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6059
31172
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
6060 /* 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
6061 if (mcnt != 0)
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6062 {
32954
f77e6c51dd07 (POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32891
diff changeset
6063 /* 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
6064 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
6065 mcnt--;
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6066 p += 4;
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6067 PUSH_NUMBER (p2, mcnt);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6068 }
31172
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
6069 else
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
6070 /* 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
6071 goto on_failure;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6072 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6073
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6074 case jump_n:
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6075 /* Signedness doesn't matter since we only compare MCNT to 0. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6076 EXTRACT_NUMBER (mcnt, p + 2);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6077 DEBUG_PRINT2 ("EXECUTING jump_n %d.\n", mcnt);
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6078
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6079 /* 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
6080 if (mcnt != 0)
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6081 {
32954
f77e6c51dd07 (POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32891
diff changeset
6082 /* 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
6083 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
6084 mcnt--;
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6085 PUSH_NUMBER (p2, mcnt);
31172
0ee53ec2081a (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30752
diff changeset
6086 goto unconditional_jump;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6087 }
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6088 /* 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
6089 else
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6090 p += 4;
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6091 break;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6092
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6093 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
6094 {
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6095 unsigned char *p2; /* Location of the counter. */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6096 DEBUG_PRINT1 ("EXECUTING set_number_at.\n");
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6097
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6098 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
6099 /* 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
6100 p2 = (unsigned char*) p + mcnt;
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6101 /* Signedness doesn't matter since we only copy MCNT's bits . */
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6102 EXTRACT_NUMBER_AND_INCR (mcnt, p);
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6103 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
6104 PUSH_NUMBER (p2, mcnt);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6105 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6106 }
13722
e2669b8a46e2 (AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents: 13565
diff changeset
6107
e2669b8a46e2 (AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents: 13565
diff changeset
6108 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
6109 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
6110 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
6111 DEBUG_PRINT2 ("EXECUTING %swordbound.\n", not?"not":"");
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6112
28163
c314d747a819 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28138
diff changeset
6113 /* 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
6114
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6115 /* 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
6116 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
6117 not = !not;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6118 else
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6119 {
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6120 /* 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
6121 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
6122 re_wchar_t c1, c2;
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6123 int s1, s2;
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
6124 int dummy;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6125 #ifdef emacs
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
6126 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
6127 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
6128 UPDATE_SYNTAX_TABLE (charpos);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6129 #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
6130 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
6131 s1 = SYNTAX (c1);
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6132 #ifdef emacs
20633
063756386696 (re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents: 20455
diff changeset
6133 UPDATE_SYNTAX_TABLE_FORWARD (charpos + 1);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6134 #endif
29296
b2c75746a989 (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29194
diff changeset
6135 PREFETCH_NOLIMIT ();
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
6136 GET_CHAR_AFTER (c2, d, dummy);
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6137 s2 = SYNTAX (c2);
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6138
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6139 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
6140 ((s1 == Sword) != (s2 == Sword))
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6141 /* 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
6142 WORD_BOUNDARY_P (C1, C2) returns nonzero. */
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6143 || ((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
6144 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
6145 }
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
6146 if (not)
13722
e2669b8a46e2 (AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents: 13565
diff changeset
6147 break;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6148 else
13722
e2669b8a46e2 (AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents: 13565
diff changeset
6149 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
6150
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6151 case wordbeg:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6152 DEBUG_PRINT1 ("EXECUTING wordbeg.\n");
18260
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 /* We FAIL in one of the following cases: */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6155
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
6156 /* 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
6157 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
6158 goto fail;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6159 else
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6160 {
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6161 /* 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
6162 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
6163 re_wchar_t c1, c2;
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6164 int s1, s2;
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
6165 int dummy;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6166 #ifdef emacs
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
6167 int offset = PTR_TO_OFFSET (d);
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
6168 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
6169 UPDATE_SYNTAX_TABLE (charpos);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6170 #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
6171 PREFETCH ();
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
6172 GET_CHAR_AFTER (c2, d, dummy);
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6173 s2 = SYNTAX (c2);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49276
diff changeset
6174
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6175 /* Case 2: S2 is not Sword. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6176 if (s2 != Sword)
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6177 goto fail;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6178
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6179 /* 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
6180 if (!AT_STRINGS_BEG (d))
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6181 {
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6182 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
6183 #ifdef emacs
20633
063756386696 (re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents: 20455
diff changeset
6184 UPDATE_SYNTAX_TABLE_BACKWARD (charpos - 1);
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6185 #endif
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6186 s1 = SYNTAX (c1);
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6187
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6188 /* ... and S1 is Sword, and WORD_BOUNDARY_P (C1, C2)
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
6189 returns 0. */
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6190 if ((s1 == Sword) && !WORD_BOUNDARY_P (c1, c2))
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6191 goto fail;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6192 }
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 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
6195
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6196 case wordend:
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6197 DEBUG_PRINT1 ("EXECUTING wordend.\n");
18260
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 /* We FAIL in one of the following cases: */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6200
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6201 /* 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
6202 if (AT_STRINGS_BEG (d))
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6203 goto fail;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6204 else
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6205 {
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6206 /* 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
6207 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
6208 re_wchar_t c1, c2;
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6209 int s1, s2;
89061
9a9b54d06f3d * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
Kenichi Handa <handa@m17n.org>
parents: 88387
diff changeset
6210 int dummy;
20633
063756386696 (re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents: 20455
diff changeset
6211 #ifdef emacs
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
6212 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
6213 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
6214 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
6215 #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
6216 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
6217 s1 = SYNTAX (c1);
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6218
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6219 /* Case 2: S1 is not Sword. */
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6220 if (s1 != Sword)
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6221 goto fail;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6222
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6223 /* 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
6224 if (!AT_STRINGS_END (d))
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6225 {
29296
b2c75746a989 (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29194
diff changeset
6226 PREFETCH_NOLIMIT ();
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
6227 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
6228 #ifdef emacs
063756386696 (re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents: 20455
diff changeset
6229 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
6230 #endif
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6231 s2 = SYNTAX (c2);
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6232
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6233 /* ... and S2 is Sword, and WORD_BOUNDARY_P (C1, C2)
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
6234 returns 0. */
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6235 if ((s2 == Sword) && !WORD_BOUNDARY_P (c1, c2))
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6236 goto fail;
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6237 }
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6238 }
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6239 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
6240
55690
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6241 case symbeg:
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6242 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
6243
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6244 /* 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
6245
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
6246 /* 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
6247 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
6248 goto fail;
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6249 else
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6250 {
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6251 /* 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
6252 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
6253 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
6254 int s1, s2;
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6255 #ifdef emacs
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6256 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
6257 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
6258 UPDATE_SYNTAX_TABLE (charpos);
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6259 #endif
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6260 PREFETCH ();
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
6261 c2 = RE_STRING_CHAR (d, target_multibyte);
55690
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6262 s2 = SYNTAX (c2);
74143
c4cd6820a92e Whitespace/tab mixups.
Juanma Barranquero <lekktu@gmail.com>
parents: 73229
diff changeset
6263
55690
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6264 /* 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
6265 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
6266 goto fail;
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6267
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6268 /* 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
6269 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
6270 {
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6271 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
6272 #ifdef emacs
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6273 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
6274 #endif
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6275 s1 = SYNTAX (c1);
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 /* ... 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
6278 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
6279 goto fail;
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6280 }
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 break;
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6283
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6284 case symend:
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6285 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
6286
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6287 /* 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
6288
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6289 /* 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
6290 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
6291 goto fail;
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6292 else
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6293 {
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6294 /* 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
6295 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
6296 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
6297 int s1, s2;
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6298 #ifdef emacs
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6299 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
6300 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
6301 UPDATE_SYNTAX_TABLE (charpos);
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6302 #endif
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6303 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
6304 s1 = SYNTAX (c1);
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 /* 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
6307 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
6308 goto fail;
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6309
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6310 /* 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
6311 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
6312 {
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6313 PREFETCH_NOLIMIT ();
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105669
diff changeset
6314 c2 = RE_STRING_CHAR (d, target_multibyte);
55690
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6315 #ifdef emacs
59039
2e087371b9ff (re_match_2_internal) <symend, wordend>:
Richard M. Stallman <rms@gnu.org>
parents: 58784
diff changeset
6316 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
6317 #endif
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6318 s2 = SYNTAX (c2);
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6319
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6320 /* ... 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
6321 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
6322 goto fail;
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6323 }
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6324 }
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6325 break;
daeeb5ef2d95 Add support for new '\_<' and '\_>' regexp operators, matching the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55530
diff changeset
6326
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6327 case syntaxspec:
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6328 case notsyntaxspec:
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6329 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
6330 mcnt = *p++;
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6331 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
6332 PREFETCH ();
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6333 #ifdef emacs
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6334 {
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
6335 int offset = PTR_TO_OFFSET (d);
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
6336 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
6337 UPDATE_SYNTAX_TABLE (pos1);
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6338 }
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6339 #endif
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6340 {
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6341 int len;
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6342 re_wchar_t c;
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6343
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
6344 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
6345 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
6346 goto fail;
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6347 d += len;
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6348 }
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6349 break;
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6350
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6351 #ifdef emacs
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6352 case before_dot:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6353 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
6354 if (PTR_BYTE_POS (d) >= PT_BYTE)
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6355 goto fail;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6356 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6357
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6358 case at_dot:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6359 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
6360 if (PTR_BYTE_POS (d) != PT_BYTE)
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6361 goto fail;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6362 break;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6363
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6364 case after_dot:
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6365 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
6366 if (PTR_BYTE_POS (d) <= PT_BYTE)
18262
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6367 goto fail;
e5e99de79a88 Fix up whitespace.
Richard M. Stallman <rms@gnu.org>
parents: 18260
diff changeset
6368 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
6369
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6370 case categoryspec:
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6371 case notcategoryspec:
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6372 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
6373 mcnt = *p++;
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6374 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
6375 PREFETCH ();
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6376 {
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6377 int len;
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6378 re_wchar_t c;
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6379
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
6380 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
6381 if ((!CHAR_HAS_CATEGORY (c, mcnt)) ^ not)
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6382 goto fail;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6383 d += len;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6384 }
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6385 break;
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6386
28261
f955117a1fcd (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28203
diff changeset
6387 #endif /* emacs */
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6388
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
6389 default:
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
6390 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
6391 }
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6392 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
6393
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6394
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6395 /* 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
6396 fail:
32823
2a7f61d7ae12 (IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents: 32805
diff changeset
6397 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
6398 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
6399 {
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6400 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
6401 /* 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
6402 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
6403 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
6404 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
6405 {
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
6406 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
6407 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
6408 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
6409
28342
9761cf2351fa (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28279
diff changeset
6410 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
6411 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
6412 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
6413 /* Fallthrough */
9761cf2351fa (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28279
diff changeset
6414
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
6415 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
6416 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
6417 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
6418 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
6419 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
6420 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
6421 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
6422 break;
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
6423
28342
9761cf2351fa (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28279
diff changeset
6424 case no_op:
9761cf2351fa (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28279
diff changeset
6425 /* 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
6426 goto fail;
9761cf2351fa (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28279
diff changeset
6427
28062
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
6428 default:
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
6429 abort();
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
6430 }
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
6431
26edef632c89 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27359
diff changeset
6432 assert (p >= bufp->buffer && p <= pend);
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6433
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
6434 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
6435 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
6436 }
11864
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 else
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
6438 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
6439 } /* 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
6440
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 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
6442 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
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 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
6445
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6446 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
6447 } /* 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
6448
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6449 /* 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
6450
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6451 /* 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
6452 bytes; nonzero otherwise. */
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6453
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6454 static int
90764
324e371fbbe5 (GET_CHAR_BEFORE_2, GET_CHAR_AFTER): Check the variable
Kenichi Handa <handa@m17n.org>
parents: 90757
diff changeset
6455 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
6456 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
6457 register int len;
13250
52e053f46f76 (TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard M. Stallman <rms@gnu.org>
parents: 13100
diff changeset
6458 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
6459 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
6460 {
28473
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
6461 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
6462 re_char *p1_end = s1 + len;
975fe3d8922e * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28380
diff changeset
6463 re_char *p2_end = s2 + len;
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
6464
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
6465 /* 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
6466 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
6467 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
6468 {
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
6469 int p1_charlen, p2_charlen;
32891
56a4ce418f35 More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32823
diff changeset
6470 re_wchar_t p1_ch, p2_ch;
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
6471
89455
ba48a280779d (GET_CHAR_BEFORE_2): Check multibyte, not
Kenichi Handa <handa@m17n.org>
parents: 89176
diff changeset
6472 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
6473 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
6474
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
6475 if (RE_TRANSLATE (translate, p1_ch)
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
6476 != 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
6477 return 1;
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
6478
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
6479 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
6480 }
21348
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
6481
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
6482 if (p1 != p1_end || p2 != p2_end)
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
6483 return 1;
64590f10c605 (compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20650
diff changeset
6484
11864
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 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
6486 }
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
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 /* 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
6489
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6490 /* 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
6491 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
6492 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
6493
11864
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 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
6495 are set in BUFP on entry.
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6496
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6497 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
6498
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6499 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
6500 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
6501 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
6502 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
6503 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
6504 {
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 reg_errcode_t ret;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6506
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6507 /* 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
6508 (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
6509 bufp->regs_allocated = REGS_UNALLOCATED;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6510
11864
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 /* 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
6512 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
6513 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
6514 bufp->no_sub = 0;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6515
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
6516 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
6517
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6518 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
6519 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
6520 return gettext (re_error_msgid[(int) ret]);
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6521 }
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
6522 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
6523
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6524 /* 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
6525 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
6526
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
6527 #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
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 /* 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
6530 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
6531
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6532 char *
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
6533 # 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
6534 /* 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
6535 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
6536 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
6537 weak_function
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
6538 # 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
6539 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
6540 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
6541 {
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 reg_errcode_t ret;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6543
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6544 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
6545 {
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 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
6547 /* 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
6548 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
6549 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
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
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)
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6553 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6554 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
6555 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
6556 /* 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
6557 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
6558 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
6559
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6560 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
6561 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
6562 /* 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
6563 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
6564 }
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 /* 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
6567 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
6568
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 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
6570
11864
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 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
6572 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
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 /* 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
6575 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
6576 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6577
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6578
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6579 int
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
6580 # 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
6581 weak_function
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
6582 # 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
6583 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
6584 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
6585 {
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 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
6587 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
6588 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
6589 }
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 #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
6591
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 /* 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
6593
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 #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
6595
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 /* 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
6597
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6598 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
6599 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
6600
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 `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
6602 `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
6603 `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
6604 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
6605 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
6606 `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
6607 `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
6608 `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
6609
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 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
6611
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 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
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_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
6615 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
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_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
6618 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
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_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
6621 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
6622
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 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
6624 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
6625 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
6626
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6627 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
6628 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
6629
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6630 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
6631 regcomp (preg, pattern, cflags)
40650
ded4aa3c81b2 (re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39718
diff changeset
6632 regex_t *__restrict preg;
ded4aa3c81b2 (re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39718
diff changeset
6633 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
6634 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
6635 {
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 reg_errcode_t ret;
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
6637 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
6638 = (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
6639 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
6640
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 /* 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
6642 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
6643 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
6644 preg->used = 0;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6645
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
6646 /* 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
6647 preg->fastmap = (char *) malloc (1 << BYTEWIDTH);
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6648
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6649 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
6650 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6651 unsigned i;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6652
13250
52e053f46f76 (TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard M. Stallman <rms@gnu.org>
parents: 13100
diff changeset
6653 preg->translate
69039
f717c65a39d7 * regex.c: Revert 2006-02-19 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 69038
diff changeset
6654 = (RE_TRANSLATE_TYPE) malloc (CHAR_SET_SIZE
69073
9e57a1e7c532 Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 69039
diff changeset
6655 * 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
6656 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
6657 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
6658
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 /* 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
6660 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
6661 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
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 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
6664 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
6665
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 /* 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
6667 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
6668 { /* 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
6669 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
6670 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
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 else
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
6673 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
6674
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 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
6676
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6677 /* 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
6678 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
6679 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
6680
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6681 /* 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
6682 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
6683 if (ret == REG_ERPAREN)
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
6684 ret = REG_EPAREN;
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
6685
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
6686 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
6687 { /* 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
6688 buffer. */
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
6689 re_compile_fastmap (preg);
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
6690 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
6691 { /* 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
6692 free (preg->fastmap);
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
6693 preg->fastmap = NULL;
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
6694 }
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
6695 }
11864
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 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
6697 }
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
6698 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
6699
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6700
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 /* 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
6702 string STRING.
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6703
11864
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 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
6705 `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
6706 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
6707 corresponding matched substrings.
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6708
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6709 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
6710 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
6711 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
6712
11864
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 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
6714
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6715 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
6716 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
6717 const regex_t *__restrict preg;
ded4aa3c81b2 (re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39718
diff changeset
6718 const char *__restrict string;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6719 size_t nmatch;
48205
b8b2159aed5e (regexec): Fix pmatch declaration.
Dave Love <fx@gnu.org>
parents: 47368
diff changeset
6720 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
6721 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
6722 {
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 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
6724 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
6725 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
6726 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
6727 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
6728
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 = *preg;
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 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
6732 private_preg.not_eol = !!(eflags & REG_NOTEOL);
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6733
11864
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 /* 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
6735 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
6736 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
6737 private_preg.regs_allocated = REGS_FIXED;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6738
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6739 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
6740 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6741 regs.num_regs = nmatch;
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
6742 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
6743 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
6744 return (int) REG_NOMATCH;
31299
34c25566aab3 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31213
diff changeset
6745 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
6746 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6747
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
6748 /* 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
6749 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
6750 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
6751 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
6752 '\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
6753 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
6754 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
6755 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
6756
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6757 /* 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
6758 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
6759 /* 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
6760 want_reg_info ? &regs : (struct re_registers *) 0);
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6761
11864
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 /* 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
6763 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
6764 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6765 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
6766 {
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
6767 unsigned r;
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
6768
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
6769 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
6770 {
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
6771 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
6772 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
6773 }
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
6774 }
18260
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6775
a642c99198ec (PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 16537
diff changeset
6776 /* 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
6777 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
6778 }
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
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6780 /* 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
6781 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
6782 }
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
6783 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
6784
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6785
74955
0b7286cbaf0c (regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents: 74323
diff changeset
6786 /* 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
6787 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
6788
0b7286cbaf0c (regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents: 74323
diff changeset
6789 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
6790 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
6791
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 size_t
74955
0b7286cbaf0c (regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents: 74323
diff changeset
6793 regerror (err_code, preg, errbuf, errbuf_size)
0b7286cbaf0c (regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents: 74323
diff changeset
6794 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
6795 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
6796 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
6797 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
6798 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6799 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
6800 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
6801
74955
0b7286cbaf0c (regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents: 74323
diff changeset
6802 if (err_code < 0
0b7286cbaf0c (regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents: 74323
diff changeset
6803 || 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
6804 /* 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
6805 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
6806 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
6807 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
6808 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
6809
74955
0b7286cbaf0c (regerror): Change parameter name err_code.
Jason Rumney <jasonr@gnu.org>
parents: 74323
diff changeset
6810 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
6811
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 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
6813
11864
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6814 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
6815 {
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6816 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
6817 {
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
6818 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
6819 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
6820 }
11864
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 else
31213
9efb8adfefa4 * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31172
diff changeset
6822 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
6823 }
620c7195b48f Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 11843
diff changeset
6824
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 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
6826 }
31312
e6b19a60e035 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31299
diff changeset
6827 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
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
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 /* 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
6831
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 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
6833 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
6834 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
6835 {
95479
9588c3703f38 remove useless if-before-free tests
Jim Meyering <jim@meyering.net>
parents: 93266
diff changeset
6836 free (preg->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
6837 preg->buffer = NULL;
13565
c66885b6330c (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 13517
diff changeset
6838
11864
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 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
6840 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
6841
95479
9588c3703f38 remove useless if-before-free tests
Jim Meyering <jim@meyering.net>
parents: 93266
diff changeset
6842 free (preg->fastmap);
11864
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 = 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
6844 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
6845
95479
9588c3703f38 remove useless if-before-free tests
Jim Meyering <jim@meyering.net>
parents: 93266
diff changeset
6846 free (preg->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
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
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49930
diff changeset
6852
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49930
diff changeset
6853 /* arch-tag: 4ffd68ba-2a9e-435b-a21a-018990f9eeb2
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49930
diff changeset
6854 (do not change this comment) */