diff options
| author | Guido van Rossum <guido@python.org> | 1997-05-09 02:35:58 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1997-05-09 02:35:58 (GMT) |
| commit | 004c1e1d07b8845e89f24a8dc8bfdfae74603ee3 (patch) | |
| tree | d0a1def3fa92c0fc4427fa6837b6691ff4e0d6e8 /Modules/regexpr.h | |
| parent | 1681429ba8e4ed680d48f1338219aa756c64a040 (diff) | |
| download | cpython-004c1e1d07b8845e89f24a8dc8bfdfae74603ee3.zip cpython-004c1e1d07b8845e89f24a8dc8bfdfae74603ee3.tar.gz cpython-004c1e1d07b8845e89f24a8dc8bfdfae74603ee3.tar.bz2 | |
Latest from Jeffrey Ollie.
Infinite failure stack, some bugs fixed (fastmap, star_jump, register bug).
Diffstat (limited to 'Modules/regexpr.h')
| -rw-r--r-- | Modules/regexpr.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/Modules/regexpr.h b/Modules/regexpr.h index 0ddb3a1..e623362 100644 --- a/Modules/regexpr.h +++ b/Modules/regexpr.h @@ -69,9 +69,7 @@ typedef struct re_registers #define re_set_syntax _Py_re_set_syntax #define re_compile_pattern _Py_re_compile_pattern #define re_match _Py_re_match -#define re_match_2 _Py_re_match_2 #define re_search _Py_re_search -#define re_search_2 _Py_re_search_2 #define re_compile_fastmap _Py_re_compile_fastmap #define re_comp _Py_re_comp #define re_exec _Py_re_exec @@ -96,20 +94,12 @@ char *re_compile_pattern(char *regex, int regex_size, regexp_t compiled); translation table, or NULL if it is not used. */ int re_match(regexp_t compiled, char *string, int size, int pos, - regexp_registers_t regs); + regexp_registers_t old_regs); /* This tries to match the regexp against the string. This returns the length of the matched portion, or -1 if the pattern could not be matched and -2 if an error (such as failure stack overflow) is encountered. */ -int re_match_2(regexp_t compiled, char *string1, int size1, - char *string2, int size2, int pos, regexp_registers_t regs, - int mstop); -/* This tries to match the regexp to the concatenation of string1 and - string2. This returns the length of the matched portion, or -1 if the - pattern could not be matched and -2 if an error (such as failure stack - overflow) is encountered. */ - int re_search(regexp_t compiled, char *string, int size, int startpos, int range, regexp_registers_t regs); /* This rearches for a substring matching the regexp. This returns the first @@ -119,12 +109,6 @@ int re_search(regexp_t compiled, char *string, int size, int startpos, which a match must not go. This returns -1 if no match is found, and -2 if an error (such as failure stack overflow) is encountered. */ -int re_search_2(regexp_t compiled, char *string1, int size1, - char *string2, int size2, int startpos, int range, - regexp_registers_t regs, int mstop); -/* This is like re_search, but search from the concatenation of string1 and - string2. */ - void re_compile_fastmap(regexp_t compiled); /* This computes the fastmap for the regexp. For this to have any effect, the calling program must have initialized the fastmap field to point @@ -146,9 +130,7 @@ extern int re_syntax; int re_set_syntax(); char *re_compile_pattern(); int re_match(); -int re_match_2(); int re_search(); -int re_search_2(); void re_compile_fastmap(); char *re_comp(); int re_exec(); |