traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

-- reset marks if repeat_one tail doesn't match 

(this should fix Sjoerd's xmllib problem)
-- added skip field to INFO header
-- changed compiler to generate charset INFO header
-- changed trace messages to support post-mortem analysis
This commit is contained in:
Fredrik Lundh 2000-08-07 20:59:04 +00:00
parent 6947d0b65e
commit 7898c3e685
4 changed files with 351 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Lib/sre.py
View File

@ -47,16 +47,16 @@ def search(pattern, string, flags=0):
return _compile(pattern, flags).search(string) return _compile(pattern, flags).search(string)
def sub(pattern, repl, string, count=0): def sub(pattern, repl, string, count=0):
return _compile(pattern).sub(repl, string, count) return _compile(pattern, 0).sub(repl, string, count)
def subn(pattern, repl, string, count=0): def subn(pattern, repl, string, count=0):
return _compile(pattern).subn(repl, string, count) return _compile(pattern, 0).subn(repl, string, count)
def split(pattern, string, maxsplit=0): def split(pattern, string, maxsplit=0):
return _compile(pattern).split(string, maxsplit) return _compile(pattern, 0).split(string, maxsplit)
def findall(pattern, string, maxsplit=0): def findall(pattern, string, maxsplit=0):
return _compile(pattern).findall(string, maxsplit) return _compile(pattern, 0).findall(string, maxsplit)
def compile(pattern, flags=0): def compile(pattern, flags=0):
return _compile(pattern, flags) return _compile(pattern, flags)
@ -88,16 +88,14 @@ def _join(seq, sep):
# internal: join into string having the same type as sep # internal: join into string having the same type as sep
return string.join(seq, sep[:0]) return string.join(seq, sep[:0])
def _compile(pattern, flags=0): def _compile(*key):
# internal: compile pattern # internal: compile pattern
tp = type(pattern) p = _cache.get(key)
if tp not in sre_compile.STRING_TYPES: if p is not None:
return p
pattern, flags = key
if type(pattern) not in sre_compile.STRING_TYPES:
return pattern return pattern
key = (tp, pattern, flags)
try:
return _cache[key]
except KeyError:
pass
try: try:
p = sre_compile.compile(pattern, flags) p = sre_compile.compile(pattern, flags)
except error, v: except error, v:
@ -168,7 +166,7 @@ import copy_reg
def _pickle(p): def _pickle(p):
return _compile, (p.pattern, p.flags) return _compile, (p.pattern, p.flags)
copy_reg.pickle(type(_compile("")), _pickle, _compile) copy_reg.pickle(type(_compile("", 0)), _pickle, _compile)
# -------------------------------------------------------------------- # --------------------------------------------------------------------
# experimental stuff (see python-dev discussions for details) # experimental stuff (see python-dev discussions for details)

366
Lib/sre_compile.py
View File

@ -14,10 +14,156 @@ from sre_constants import *
MAXCODE = 65535 MAXCODE = 65535
def _charset(charset, fixup=None): def _compile(code, pattern, flags):
# internal: optimize character set # internal: compile a (sub)pattern
emit = code.append
for op, av in pattern:
if op in (LITERAL, NOT_LITERAL):
if flags & SRE_FLAG_IGNORECASE:
emit(OPCODES[OP_IGNORE[op]])
else:
emit(OPCODES[op])
emit(av)
elif op is IN:
if flags & SRE_FLAG_IGNORECASE:
emit(OPCODES[OP_IGNORE[op]])
def fixup(literal, flags=flags):
return _sre.getlower(literal, flags)
else:
emit(OPCODES[op])
fixup = lambda x: x
skip = len(code); emit(0)
_compile_charset(av, flags, code, fixup)
code[skip] = len(code) - skip
elif op is ANY:
if flags & SRE_FLAG_DOTALL:
emit(OPCODES[ANY_ALL])
else:
emit(OPCODES[ANY])
elif op in (REPEAT, MIN_REPEAT, MAX_REPEAT):
if flags & SRE_FLAG_TEMPLATE:
raise error, "internal: unsupported template operator"
emit(OPCODES[REPEAT])
skip = len(code); emit(0)
emit(av[0])
emit(av[1])
_compile(code, av[2], flags)
emit(OPCODES[SUCCESS])
code[skip] = len(code) - skip
elif _simple(av) and op == MAX_REPEAT:
emit(OPCODES[REPEAT_ONE])
skip = len(code); emit(0)
emit(av[0])
emit(av[1])
_compile(code, av[2], flags)
emit(OPCODES[SUCCESS])
code[skip] = len(code) - skip
else:
emit(OPCODES[REPEAT])
skip = len(code); emit(0)
emit(av[0])
emit(av[1])
_compile(code, av[2], flags)
code[skip] = len(code) - skip
if op == MAX_REPEAT:
emit(OPCODES[MAX_UNTIL])
else:
emit(OPCODES[MIN_UNTIL])
elif op is SUBPATTERN:
if av[0]:
emit(OPCODES[MARK])
emit((av[0]-1)*2)
# _compile_info(code, av[1], flags)
_compile(code, av[1], flags)
if av[0]:
emit(OPCODES[MARK])
emit((av[0]-1)*2+1)
elif op in (SUCCESS, FAILURE):
emit(OPCODES[op])
elif op in (ASSERT, ASSERT_NOT):
emit(OPCODES[op])
skip = len(code); emit(0)
if av[0] >= 0:
emit(0) # look ahead
else:
lo, hi = av[1].getwidth()
if lo != hi:
raise error, "look-behind requires fixed-width pattern"
emit(lo) # look behind
_compile(code, av[1], flags)
emit(OPCODES[SUCCESS])
code[skip] = len(code) - skip
elif op is CALL:
emit(OPCODES[op])
skip = len(code); emit(0)
_compile(code, av, flags)
emit(OPCODES[SUCCESS])
code[skip] = len(code) - skip
elif op is AT:
emit(OPCODES[op])
if flags & SRE_FLAG_MULTILINE:
emit(ATCODES[AT_MULTILINE.get(av, av)])
else:
emit(ATCODES[av])
elif op is BRANCH:
emit(OPCODES[op])
tail = []
for av in av[1]:
skip = len(code); emit(0)
# _compile_info(code, av, flags)
_compile(code, av, flags)
emit(OPCODES[JUMP])
tail.append(len(code)); emit(0)
code[skip] = len(code) - skip
emit(0) # end of branch
for tail in tail:
code[tail] = len(code) - tail
elif op is CATEGORY:
emit(OPCODES[op])
if flags & SRE_FLAG_LOCALE:
emit(CHCODES[CH_LOCALE[av]])
elif flags & SRE_FLAG_UNICODE:
emit(CHCODES[CH_UNICODE[av]])
else:
emit(CHCODES[av])
elif op is GROUPREF:
if flags & SRE_FLAG_IGNORECASE:
emit(OPCODES[OP_IGNORE[op]])
else:
emit(OPCODES[op])
emit(av-1)
else:
raise ValueError, ("unsupported operand type", op)
def _compile_charset(charset, flags, code, fixup=None):
# compile charset subprogram
emit = code.append
if not fixup: if not fixup:
fixup = lambda x: x fixup = lambda x: x
for op, av in _optimize_charset(charset, fixup):
emit(OPCODES[op])
if op is NEGATE:
pass
elif op is LITERAL:
emit(fixup(av))
elif op is RANGE:
emit(fixup(av[0]))
emit(fixup(av[1]))
elif op is CHARSET:
code.extend(av)
elif op is CATEGORY:
if flags & SRE_FLAG_LOCALE:
emit(CHCODES[CH_LOCALE[av]])
elif flags & SRE_FLAG_UNICODE:
emit(CHCODES[CH_UNICODE[av]])
else:
emit(CHCODES[av])
else:
raise error, "internal: unsupported set operator"
emit(OPCODES[FAILURE])
def _optimize_charset(charset, fixup):
# internal: optimize character set
out = [] out = []
charmap = [0]*256 charmap = [0]*256
try: try:
@ -33,7 +179,7 @@ def _charset(charset, fixup=None):
# FIXME: could append to charmap tail # FIXME: could append to charmap tail
return charset # cannot compress return charset # cannot compress
except IndexError: except IndexError:
# unicode # character set contains unicode characters
return charset return charset
# compress character map # compress character map
i = p = n = 0 i = p = n = 0
@ -80,145 +226,6 @@ def _simple(av):
raise error, "nothing to repeat" raise error, "nothing to repeat"
return lo == hi == 1 and av[2][0][0] != SUBPATTERN return lo == hi == 1 and av[2][0][0] != SUBPATTERN
def _compile(code, pattern, flags):
# internal: compile a (sub)pattern
emit = code.append
for op, av in pattern:
if op in (LITERAL, NOT_LITERAL):
if flags & SRE_FLAG_IGNORECASE:
emit(OPCODES[OP_IGNORE[op]])
else:
emit(OPCODES[op])
emit(av)
elif op is IN:
if flags & SRE_FLAG_IGNORECASE:
emit(OPCODES[OP_IGNORE[op]])
def fixup(literal, flags=flags):
return _sre.getlower(literal, flags)
else:
emit(OPCODES[op])
fixup = lambda x: x
skip = len(code); emit(0)
for op, av in _charset(av, fixup):
emit(OPCODES[op])
if op is NEGATE:
pass
elif op is LITERAL:
emit(fixup(av))
elif op is RANGE:
emit(fixup(av[0]))
emit(fixup(av[1]))
elif op is CHARSET:
code.extend(av)
elif op is CATEGORY:
if flags & SRE_FLAG_LOCALE:
emit(CHCODES[CH_LOCALE[av]])
elif flags & SRE_FLAG_UNICODE:
emit(CHCODES[CH_UNICODE[av]])
else:
emit(CHCODES[av])
else:
raise error, "internal: unsupported set operator"
emit(OPCODES[FAILURE])
code[skip] = len(code) - skip
elif op is ANY:
if flags & SRE_FLAG_DOTALL:
emit(OPCODES[ANY_ALL])
else:
emit(OPCODES[ANY])
elif op in (REPEAT, MIN_REPEAT, MAX_REPEAT):
if flags & SRE_FLAG_TEMPLATE:
raise error, "internal: unsupported template operator"
emit(OPCODES[REPEAT])
skip = len(code); emit(0)
emit(av[0])
emit(av[1])
_compile(code, av[2], flags)
emit(OPCODES[SUCCESS])
code[skip] = len(code) - skip
elif _simple(av) and op == MAX_REPEAT:
emit(OPCODES[REPEAT_ONE])
skip = len(code); emit(0)
emit(av[0])
emit(av[1])
_compile(code, av[2], flags)
emit(OPCODES[SUCCESS])
code[skip] = len(code) - skip
else:
emit(OPCODES[REPEAT])
skip = len(code); emit(0)
emit(av[0])
emit(av[1])
_compile(code, av[2], flags)
code[skip] = len(code) - skip
if op == MAX_REPEAT:
emit(OPCODES[MAX_UNTIL])
else:
emit(OPCODES[MIN_UNTIL])
elif op is SUBPATTERN:
if av[0]:
emit(OPCODES[MARK])
emit((av[0]-1)*2)
_compile(code, av[1], flags)
if av[0]:
emit(OPCODES[MARK])
emit((av[0]-1)*2+1)
elif op in (SUCCESS, FAILURE):
emit(OPCODES[op])
elif op in (ASSERT, ASSERT_NOT):
emit(OPCODES[op])
skip = len(code); emit(0)
if av[0] >= 0:
emit(0) # look ahead
else:
lo, hi = av[1].getwidth()
if lo != hi:
raise error, "look-behind requires fixed-width pattern"
emit(lo) # look behind
_compile(code, av[1], flags)
emit(OPCODES[SUCCESS])
code[skip] = len(code) - skip
elif op is CALL:
emit(OPCODES[op])
skip = len(code); emit(0)
_compile(code, av, flags)
emit(OPCODES[SUCCESS])
code[skip] = len(code) - skip
elif op is AT:
emit(OPCODES[op])
if flags & SRE_FLAG_MULTILINE:
emit(ATCODES[AT_MULTILINE.get(av, av)])
else:
emit(ATCODES[av])
elif op is BRANCH:
emit(OPCODES[op])
tail = []
for av in av[1]:
skip = len(code); emit(0)
_compile(code, av, flags)
emit(OPCODES[JUMP])
tail.append(len(code)); emit(0)
code[skip] = len(code) - skip
emit(0) # end of branch
for tail in tail:
code[tail] = len(code) - tail
elif op is CATEGORY:
emit(OPCODES[op])
if flags & SRE_FLAG_LOCALE:
emit(CHCODES[CH_LOCALE[av]])
elif flags & SRE_FLAG_UNICODE:
emit(CHCODES[CH_UNICODE[av]])
else:
emit(CHCODES[av])
elif op is GROUPREF:
if flags & SRE_FLAG_IGNORECASE:
emit(OPCODES[OP_IGNORE[op]])
else:
emit(OPCODES[op])
emit(av-1)
else:
raise ValueError, ("unsupported operand type", op)
def _compile_info(code, pattern, flags): def _compile_info(code, pattern, flags):
# internal: compile an info block. in the current version, # internal: compile an info block. in the current version,
# this contains min/max pattern width, and an optional literal # this contains min/max pattern width, and an optional literal
@ -228,13 +235,60 @@ def _compile_info(code, pattern, flags):
return # not worth it return # not worth it
# look for a literal prefix # look for a literal prefix
prefix = [] prefix = []
prefix_skip = 0
charset = [] # not used charset = [] # not used
if not (flags & SRE_FLAG_IGNORECASE): if not (flags & SRE_FLAG_IGNORECASE):
# look for literal prefix
for op, av in pattern.data: for op, av in pattern.data:
if op is LITERAL: if op is LITERAL:
if len(prefix) == prefix_skip:
prefix_skip = prefix_skip + 1
prefix.append(av) prefix.append(av)
elif op is SUBPATTERN and len(av[1]) == 1:
op, av = av[1][0]
if op is LITERAL:
prefix.append(av)
else:
break
else: else:
break break
# if no prefix, look for charset prefix
if not prefix and pattern.data:
op, av = pattern.data[0]
if op is SUBPATTERN and av[1]:
op, av = av[1][0]
if op is LITERAL:
charset.append((op, av))
elif op is BRANCH:
c = []
for p in av[1]:
if not p:
break
op, av = p[0]
if op is LITERAL:
c.append((op, av))
else:
break
else:
charset = c
elif op is BRANCH:
c = []
for p in av[1]:
if not p:
break
op, av = p[0]
if op is LITERAL:
c.append((op, av))
else:
break
else:
charset = c
elif op is IN:
charset = av
## if prefix:
## print "*** PREFIX", prefix, prefix_skip
## if charset:
## print "*** CHARSET", charset
# add an info block # add an info block
emit = code.append emit = code.append
emit(OPCODES[INFO]) emit(OPCODES[INFO])
@ -243,7 +297,7 @@ def _compile_info(code, pattern, flags):
mask = 0 mask = 0
if prefix: if prefix:
mask = SRE_INFO_PREFIX mask = SRE_INFO_PREFIX
if len(prefix) == len(pattern.data): if len(prefix) == prefix_skip == len(pattern.data):
mask = mask + SRE_INFO_LITERAL mask = mask + SRE_INFO_LITERAL
elif charset: elif charset:
mask = mask + SRE_INFO_CHARSET mask = mask + SRE_INFO_CHARSET
@ -260,22 +314,18 @@ def _compile_info(code, pattern, flags):
emit(0) emit(0)
# add literal prefix # add literal prefix
if prefix: if prefix:
emit(len(prefix)) emit(len(prefix)) # length
if prefix: emit(prefix_skip) # skip
code.extend(prefix) code.extend(prefix)
# generate overlap table # generate overlap table
table = [-1] + ([0]*len(prefix)) table = [-1] + ([0]*len(prefix))
for i in range(len(prefix)): for i in range(len(prefix)):
table[i+1] = table[i]+1 table[i+1] = table[i]+1
while table[i+1] > 0 and prefix[i] != prefix[table[i+1]-1]: while table[i+1] > 0 and prefix[i] != prefix[table[i+1]-1]:
table[i+1] = table[table[i+1]-1]+1 table[i+1] = table[table[i+1]-1]+1
code.extend(table[1:]) # don't store first entry code.extend(table[1:]) # don't store first entry
elif charset: elif charset:
# FIXME: use charset optimizer! _compile_charset(charset, 0, code)
for char in charset:
emit(OPCODES[LITERAL])
emit(char)
emit(OPCODES[FAILURE])
code[skip] = len(code) - skip code[skip] = len(code) - skip
STRING_TYPES = [type("")] STRING_TYPES = [type("")]

8
Lib/sre_parse.py
View File

@ -10,8 +10,6 @@
import string, sys import string, sys
import _sre
from sre_constants import * from sre_constants import *
MAXREPEAT = 65535 MAXREPEAT = 65535
@ -232,6 +230,7 @@ def _class_escape(source, escape):
return code return code
try: try:
if escape[1:2] == "x": if escape[1:2] == "x":
# FIXME: in 2.0, \xNN must have exactly two digits
while source.next in HEXDIGITS: while source.next in HEXDIGITS:
escape = escape + source.get() escape = escape + source.get()
escape = escape[2:] escape = escape[2:]
@ -556,12 +555,13 @@ def _parse(source, state):
return subpattern return subpattern
def parse(str, flags=0): def parse(str, flags=0, pattern=None):
# parse 're' pattern into list of (opcode, argument) tuples # parse 're' pattern into list of (opcode, argument) tuples
source = Tokenizer(str) source = Tokenizer(str)
pattern = Pattern() if pattern is None:
pattern = Pattern()
pattern.flags = flags pattern.flags = flags
p = _parse_sub(source, pattern, 0) p = _parse_sub(source, pattern, 0)

221
Modules/_sre.c
View File

@ -13,8 +13,8 @@
* 00-07-08 fl added regs attribute * 00-07-08 fl added regs attribute
* 00-07-21 fl reset lastindex in scanner methods (0.9.6) * 00-07-21 fl reset lastindex in scanner methods (0.9.6)
* 00-08-01 fl fixes for 1.6b1 (0.9.8) * 00-08-01 fl fixes for 1.6b1 (0.9.8)
* 00-08-02 fl moved SRE_COUNT out of the match method
* 00-08-03 fl added recursion limit * 00-08-03 fl added recursion limit
* 00-08-07 fl use PyOS_CheckStack() if available
* *
* Copyright (c) 1997-2000 by Secret Labs AB. All rights reserved. * Copyright (c) 1997-2000 by Secret Labs AB. All rights reserved.
* *
@ -93,8 +93,6 @@ char copyright[] = " SRE 0.9.8 Copyright (c) 1997-2000 by Secret Labs AB ";
#define TRACE(v) #define TRACE(v)
#endif #endif
#define PTR(ptr) ((SRE_CHAR*) (ptr) - (SRE_CHAR*) state->beginning)
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* search engine state */ /* search engine state */
@ -265,7 +263,7 @@ mark_save(SRE_STATE* state, int lo, int hi)
state->mark_stack_size = newsize; state->mark_stack_size = newsize;
} }
TRACE(("copy %d:%d to %d\n", lo, hi, state->mark_stack_base)); TRACE(("copy %d:%d to %d (%d)\n", lo, hi, state->mark_stack_base, size));
memcpy(state->mark_stack + state->mark_stack_base, state->mark + lo, memcpy(state->mark_stack + state->mark_stack_base, state->mark + lo,
size * sizeof(void*)); size * sizeof(void*));
@ -300,7 +298,8 @@ mark_restore(SRE_STATE* state, int lo, int hi)
#define SRE_CHAR unsigned char #define SRE_CHAR unsigned char
#define SRE_AT sre_at #define SRE_AT sre_at
#define SRE_COUNT sre_count #define SRE_COUNT sre_count
#define SRE_MEMBER sre_member #define SRE_CHARSET sre_charset
#define SRE_INFO sre_info
#define SRE_MATCH sre_match #define SRE_MATCH sre_match
#define SRE_SEARCH sre_search #define SRE_SEARCH sre_search
@ -312,7 +311,8 @@ mark_restore(SRE_STATE* state, int lo, int hi)
#undef SRE_SEARCH #undef SRE_SEARCH
#undef SRE_MATCH #undef SRE_MATCH
#undef SRE_MEMBER #undef SRE_INFO
#undef SRE_CHARSET
#undef SRE_COUNT #undef SRE_COUNT
#undef SRE_AT #undef SRE_AT
#undef SRE_CHAR #undef SRE_CHAR
@ -322,7 +322,8 @@ mark_restore(SRE_STATE* state, int lo, int hi)
#define SRE_CHAR Py_UNICODE #define SRE_CHAR Py_UNICODE
#define SRE_AT sre_uat #define SRE_AT sre_uat
#define SRE_COUNT sre_ucount #define SRE_COUNT sre_ucount
#define SRE_MEMBER sre_umember #define SRE_CHARSET sre_ucharset
#define SRE_INFO sre_uinfo
#define SRE_MATCH sre_umatch #define SRE_MATCH sre_umatch
#define SRE_SEARCH sre_usearch #define SRE_SEARCH sre_usearch
#endif #endif
@ -383,7 +384,7 @@ SRE_AT(SRE_STATE* state, SRE_CHAR* ptr, SRE_CODE at)
} }
LOCAL(int) LOCAL(int)
SRE_MEMBER(SRE_CODE* set, SRE_CODE ch) SRE_CHARSET(SRE_CODE* set, SRE_CODE ch)
{ {
/* check if character is a member of the given set */ /* check if character is a member of the given set */
@ -453,6 +454,7 @@ SRE_COUNT(SRE_STATE* state, SRE_CODE* pattern, int maxcount, int level)
case SRE_OP_ANY: case SRE_OP_ANY:
/* repeated dot wildcard. */ /* repeated dot wildcard. */
TRACE(("|%p|%p|COUNT ANY\n", pattern, ptr));
while (ptr < end && !SRE_IS_LINEBREAK(*ptr)) while (ptr < end && !SRE_IS_LINEBREAK(*ptr))
ptr++; ptr++;
break; break;
@ -460,12 +462,14 @@ SRE_COUNT(SRE_STATE* state, SRE_CODE* pattern, int maxcount, int level)
case SRE_OP_ANY_ALL: case SRE_OP_ANY_ALL:
/* repeated dot wildcare. skip to the end of the target /* repeated dot wildcare. skip to the end of the target
string, and backtrack from there */ string, and backtrack from there */
TRACE(("|%p|%p|COUNT ANY_ALL\n", pattern, ptr));
ptr = end; ptr = end;
break; break;
case SRE_OP_LITERAL: case SRE_OP_LITERAL:
/* repeated literal */ /* repeated literal */
chr = pattern[1]; chr = pattern[1];
TRACE(("|%p|%p|COUNT LITERAL %d\n", pattern, ptr, chr));
while (ptr < end && (SRE_CODE) *ptr == chr) while (ptr < end && (SRE_CODE) *ptr == chr)
ptr++; ptr++;
break; break;
@ -473,6 +477,7 @@ SRE_COUNT(SRE_STATE* state, SRE_CODE* pattern, int maxcount, int level)
case SRE_OP_LITERAL_IGNORE: case SRE_OP_LITERAL_IGNORE:
/* repeated literal */ /* repeated literal */
chr = pattern[1]; chr = pattern[1];
TRACE(("|%p|%p|COUNT LITERAL_IGNORE %d\n", pattern, ptr, chr));
while (ptr < end && (SRE_CODE) state->lower(*ptr) == chr) while (ptr < end && (SRE_CODE) state->lower(*ptr) == chr)
ptr++; ptr++;
break; break;
@ -480,6 +485,7 @@ SRE_COUNT(SRE_STATE* state, SRE_CODE* pattern, int maxcount, int level)
case SRE_OP_NOT_LITERAL: case SRE_OP_NOT_LITERAL:
/* repeated non-literal */ /* repeated non-literal */
chr = pattern[1]; chr = pattern[1];
TRACE(("|%p|%p|COUNT NOT_LITERAL %d\n", pattern, ptr, chr));
while (ptr < end && (SRE_CODE) *ptr != chr) while (ptr < end && (SRE_CODE) *ptr != chr)
ptr++; ptr++;
break; break;
@ -487,18 +493,21 @@ SRE_COUNT(SRE_STATE* state, SRE_CODE* pattern, int maxcount, int level)
case SRE_OP_NOT_LITERAL_IGNORE: case SRE_OP_NOT_LITERAL_IGNORE:
/* repeated non-literal */ /* repeated non-literal */
chr = pattern[1]; chr = pattern[1];
TRACE(("|%p|%p|COUNT NOT_LITERAL_IGNORE %d\n", pattern, ptr, chr));
while (ptr < end && (SRE_CODE) state->lower(*ptr) != chr) while (ptr < end && (SRE_CODE) state->lower(*ptr) != chr)
ptr++; ptr++;
break; break;
case SRE_OP_IN: case SRE_OP_IN:
/* repeated set */ /* repeated set */
while (ptr < end && SRE_MEMBER(pattern + 2, *ptr)) TRACE(("|%p|%p|COUNT IN\n", pattern, ptr));
while (ptr < end && SRE_CHARSET(pattern + 2, *ptr))
ptr++; ptr++;
break; break;
default: default:
/* repeated single character pattern */ /* repeated single character pattern */
TRACE(("|%p|%p|COUNT SUBPATTERN\n", pattern, ptr));
while ((SRE_CHAR*) state->ptr < end) { while ((SRE_CHAR*) state->ptr < end) {
i = SRE_MATCH(state, pattern, level); i = SRE_MATCH(state, pattern, level);
if (i < 0) if (i < 0)
@ -506,12 +515,41 @@ SRE_COUNT(SRE_STATE* state, SRE_CODE* pattern, int maxcount, int level)
if (!i) if (!i)
break; break;
} }
TRACE(("|%p|%p|COUNT %d\n", pattern, ptr,
(SRE_CHAR*) state->ptr - ptr));
return (SRE_CHAR*) state->ptr - ptr; return (SRE_CHAR*) state->ptr - ptr;
} }
TRACE(("|%p|%p|COUNT %d\n", pattern, ptr, ptr - (SRE_CHAR*) state->ptr));
return ptr - (SRE_CHAR*) state->ptr; return ptr - (SRE_CHAR*) state->ptr;
} }
LOCAL(int)
SRE_INFO(SRE_STATE* state, SRE_CODE* pattern)
{
/* check if an SRE_OP_INFO block matches at the current position.
returns the number of SRE_CODE objects to skip if successful, 0
if no match */
SRE_CHAR* end = state->end;
SRE_CHAR* ptr = state->ptr;
int i;
/* check minimal length */
if (pattern[3] && (end - ptr) < pattern[3])
return 0;
/* check known prefix */
if (pattern[2] & SRE_INFO_PREFIX && pattern[5] > 1) {
/* <length> <skip> <prefix data> <overlap data> */
for (i = 0; i < pattern[5]; i++)
if ((SRE_CODE) ptr[i] != pattern[7 + i])
return 0;
return pattern[0] + 2 * pattern[6];
}
return pattern[0];
}
LOCAL(int) LOCAL(int)
SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level) SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
{ {
@ -527,7 +565,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
SRE_REPEAT rep; /* FIXME: <fl> allocate in STATE instead */ SRE_REPEAT rep; /* FIXME: <fl> allocate in STATE instead */
TRACE(("%8d: enter %d\n", PTR(ptr), level)); TRACE(("|%p|%p|ENTER %d\n", pattern, ptr, level));
#if defined(USE_STACKCHECK) #if defined(USE_STACKCHECK)
if (level % 10 == 0 && PyOS_CheckStack()) { if (level % 10 == 0 && PyOS_CheckStack()) {
@ -556,19 +594,19 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
case SRE_OP_FAILURE: case SRE_OP_FAILURE:
/* immediate failure */ /* immediate failure */
TRACE(("%8d: failure\n", PTR(ptr))); TRACE(("|%p|%p|FAILURE\n", pattern, ptr));
return 0; return 0;
case SRE_OP_SUCCESS: case SRE_OP_SUCCESS:
/* end of pattern */ /* end of pattern */
TRACE(("%8d: success\n", PTR(ptr))); TRACE(("|%p|%p|SUCCESS\n", pattern, ptr));
state->ptr = ptr; state->ptr = ptr;
return 1; return 1;
case SRE_OP_AT: case SRE_OP_AT:
/* match at given position */ /* match at given position */
/* <AT> <code> */ /* <AT> <code> */
TRACE(("%8d: position %d\n", PTR(ptr), *pattern)); TRACE(("|%p|%p|AT %d\n", pattern, ptr, *pattern));
if (!SRE_AT(state, ptr, *pattern)) if (!SRE_AT(state, ptr, *pattern))
return 0; return 0;
pattern++; pattern++;
@ -577,11 +615,9 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
case SRE_OP_CATEGORY: case SRE_OP_CATEGORY:
/* match at given category */ /* match at given category */
/* <CATEGORY> <code> */ /* <CATEGORY> <code> */
TRACE(("%8d: category %d [category %d]\n", PTR(ptr), TRACE(("|%p|%p|CATEGORY %d\n", pattern, ptr, *pattern));
*ptr, *pattern));
if (ptr >= end || !sre_category(pattern[0], ptr[0])) if (ptr >= end || !sre_category(pattern[0], ptr[0]))
return 0; return 0;
TRACE(("%8d: category ok\n", PTR(ptr)));
pattern++; pattern++;
ptr++; ptr++;
break; break;
@ -589,7 +625,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
case SRE_OP_LITERAL: case SRE_OP_LITERAL:
/* match literal string */ /* match literal string */
/* <LITERAL> <code> */ /* <LITERAL> <code> */
TRACE(("%8d: literal %c\n", PTR(ptr), pattern[0])); TRACE(("|%p|%p|LITERAL %d\n", pattern, ptr, *pattern));
if (ptr >= end || (SRE_CODE) ptr[0] != pattern[0]) if (ptr >= end || (SRE_CODE) ptr[0] != pattern[0])
return 0; return 0;
pattern++; pattern++;
@ -599,7 +635,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
case SRE_OP_NOT_LITERAL: case SRE_OP_NOT_LITERAL:
/* match anything that is not literal character */ /* match anything that is not literal character */
/* <NOT_LITERAL> <code> */ /* <NOT_LITERAL> <code> */
TRACE(("%8d: literal not %c\n", PTR(ptr), pattern[0])); TRACE(("|%p|%p|NOT_LITERAL %d\n", pattern, ptr, *pattern));
if (ptr >= end || (SRE_CODE) ptr[0] == pattern[0]) if (ptr >= end || (SRE_CODE) ptr[0] == pattern[0])
return 0; return 0;
pattern++; pattern++;
@ -609,7 +645,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
case SRE_OP_ANY: case SRE_OP_ANY:
/* match anything (except a newline) */ /* match anything (except a newline) */
/* <ANY> */ /* <ANY> */
TRACE(("%8d: anything (except newline)\n", PTR(ptr))); TRACE(("|%p|%p|ANY\n", pattern, ptr));
if (ptr >= end || SRE_IS_LINEBREAK(ptr[0])) if (ptr >= end || SRE_IS_LINEBREAK(ptr[0]))
return 0; return 0;
ptr++; ptr++;
@ -618,7 +654,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
case SRE_OP_ANY_ALL: case SRE_OP_ANY_ALL:
/* match anything */ /* match anything */
/* <ANY_ALL> */ /* <ANY_ALL> */
TRACE(("%8d: anything\n", PTR(ptr))); TRACE(("|%p|%p|ANY_ALL\n", pattern, ptr));
if (ptr >= end) if (ptr >= end)
return 0; return 0;
ptr++; ptr++;
@ -627,8 +663,8 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
case SRE_OP_IN: case SRE_OP_IN:
/* match set member (or non_member) */ /* match set member (or non_member) */
/* <IN> <skip> <set> */ /* <IN> <skip> <set> */
TRACE(("%8d: set %c\n", PTR(ptr), *ptr)); TRACE(("|%p|%p|IN\n", pattern, ptr));
if (ptr >= end || !SRE_MEMBER(pattern + 1, *ptr)) if (ptr >= end || !SRE_CHARSET(pattern + 1, *ptr))
return 0; return 0;
pattern += pattern[0]; pattern += pattern[0];
ptr++; ptr++;
@ -636,7 +672,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
case SRE_OP_GROUPREF: case SRE_OP_GROUPREF:
/* match backreference */ /* match backreference */
TRACE(("%8d: group %d\n", PTR(ptr), pattern[0])); TRACE(("|%p|%p|GROUPREF %d\n", pattern, ptr, pattern[0]));
i = pattern[0]; i = pattern[0];
{ {
SRE_CHAR* p = (SRE_CHAR*) state->mark[i+i]; SRE_CHAR* p = (SRE_CHAR*) state->mark[i+i];
@ -654,7 +690,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
case SRE_OP_GROUPREF_IGNORE: case SRE_OP_GROUPREF_IGNORE:
/* match backreference */ /* match backreference */
TRACE(("%8d: group ignore %d\n", PTR(ptr), pattern[0])); TRACE(("|%p|%p|GROUPREF_IGNORE %d\n", pattern, ptr, pattern[0]));
i = pattern[0]; i = pattern[0];
{ {
SRE_CHAR* p = (SRE_CHAR*) state->mark[i+i]; SRE_CHAR* p = (SRE_CHAR*) state->mark[i+i];
@ -672,7 +708,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
break; break;
case SRE_OP_LITERAL_IGNORE: case SRE_OP_LITERAL_IGNORE:
TRACE(("%8d: literal lower(%c)\n", PTR(ptr), pattern[0])); TRACE(("|%p|%p|LITERAL_IGNORE %d\n", pattern, ptr, pattern[0]));
if (ptr >= end || if (ptr >= end ||
state->lower(*ptr) != state->lower(*pattern)) state->lower(*ptr) != state->lower(*pattern))
return 0; return 0;
@ -681,7 +717,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
break; break;
case SRE_OP_NOT_LITERAL_IGNORE: case SRE_OP_NOT_LITERAL_IGNORE:
TRACE(("%8d: literal not lower(%c)\n", PTR(ptr), pattern[0])); TRACE(("|%p|%p|NOT_LITERAL_IGNORE %d\n", pattern, ptr, *pattern));
if (ptr >= end || if (ptr >= end ||
state->lower(*ptr) == state->lower(*pattern)) state->lower(*ptr) == state->lower(*pattern))
return 0; return 0;
@ -690,9 +726,9 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
break; break;
case SRE_OP_IN_IGNORE: case SRE_OP_IN_IGNORE:
TRACE(("%8d: set lower(%c)\n", PTR(ptr), *ptr)); TRACE(("|%p|%p|IN_IGNORE\n", pattern, ptr));
if (ptr >= end if (ptr >= end
|| !SRE_MEMBER(pattern + 1, (SRE_CODE) state->lower(*ptr))) || !SRE_CHARSET(pattern + 1, (SRE_CODE) state->lower(*ptr)))
return 0; return 0;
pattern += pattern[0]; pattern += pattern[0];
ptr++; ptr++;
@ -701,7 +737,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
case SRE_OP_MARK: case SRE_OP_MARK:
/* set mark */ /* set mark */
/* <MARK> <gid> */ /* <MARK> <gid> */
TRACE(("%8d: set mark %d\n", PTR(ptr), pattern[0])); TRACE(("|%p|%p|MARK %d\n", pattern, ptr, pattern[0]));
i = pattern[0]; i = pattern[0];
if (i & 1) if (i & 1)
state->lastindex = i/2 + 1; state->lastindex = i/2 + 1;
@ -715,14 +751,14 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
case SRE_OP_INFO: case SRE_OP_INFO:
/* jump forward */ /* jump forward */
/* <JUMP> <offset> */ /* <JUMP> <offset> */
TRACE(("%8d: jump +%d\n", PTR(ptr), pattern[0])); TRACE(("|%p|%p|JUMP %d\n", pattern, ptr, pattern[0]));
pattern += pattern[0]; pattern += pattern[0];
break; break;
case SRE_OP_ASSERT: case SRE_OP_ASSERT:
/* assert subpattern */ /* assert subpattern */
/* <ASSERT> <skip> <back> <pattern> */ /* <ASSERT> <skip> <back> <pattern> */
TRACE(("%8d: assert subpattern %d\n", PTR(ptr), pattern[1])); TRACE(("|%p|%p|ASSERT %d\n", pattern, ptr, pattern[1]));
state->ptr = ptr - pattern[1]; state->ptr = ptr - pattern[1];
if (state->ptr < state->beginning) if (state->ptr < state->beginning)
return 0; return 0;
@ -737,7 +773,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
case SRE_OP_ASSERT_NOT: case SRE_OP_ASSERT_NOT:
/* assert not subpattern */ /* assert not subpattern */
/* <ASSERT_NOT> <skip> <back> <pattern> */ /* <ASSERT_NOT> <skip> <back> <pattern> */
TRACE(("%8d: assert not subpattern %d\n", PTR(ptr), pattern[1])); TRACE(("|%p|%p|ASSERT_NOT %d\n", pattern, ptr, pattern[1]));
state->ptr = ptr - pattern[1]; state->ptr = ptr - pattern[1];
if (state->ptr < state->beginning) if (state->ptr < state->beginning)
return 0; return 0;
@ -754,34 +790,26 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
case SRE_OP_BRANCH: case SRE_OP_BRANCH:
/* alternation */ /* alternation */
/* <BRANCH> <0=skip> code <JUMP> ... <NULL> */ /* <BRANCH> <0=skip> code <JUMP> ... <NULL> */
TRACE(("%8d: branch\n", PTR(ptr))); TRACE(("|%p|%p|BRANCH\n", pattern, ptr));
lastmark = state->lastmark; lastmark = state->lastmark;
while (pattern[0]) { for (; pattern[0]; pattern += pattern[0]) {
SRE_CODE* code = pattern+1; if (pattern[1] == SRE_OP_LITERAL &&
TRACE(("%8d: try branch\n", PTR(ptr))); (ptr >= end || (SRE_CODE) *ptr != pattern[2]))
switch (code[0]) { continue;
case SRE_OP_IN: if (pattern[1] == SRE_OP_IN &&
if (ptr >= end || !SRE_MEMBER(code + 2, ptr[0])) (ptr >= end || !SRE_CHARSET(pattern + 3, (SRE_CODE) *ptr)))
break; continue;
code += code[1] + 1; state->ptr = ptr;
state->ptr = ptr + 1; i = SRE_MATCH(state, pattern + 1, level + 1);
goto branch; if (i)
case SRE_OP_LITERAL: return i;
if (ptr >= end || (SRE_CODE) ptr[0] != code[1]) if (state->lastmark > lastmark) {
break; memset(
code += 2; state->mark + lastmark + 1, 0,
state->ptr = ptr + 1; (state->lastmark - lastmark) * sizeof(void*)
goto branch; );
default: state->lastmark = lastmark;
state->ptr = ptr;
branch:
i = SRE_MATCH(state, code, level + 1);
if (i)
return i;
while (state->lastmark > lastmark)
state->mark[state->lastmark--] = NULL;
} }
pattern += pattern[0];
} }
return 0; return 0;
@ -795,7 +823,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
/* <REPEAT_ONE> <skip> <1=min> <2=max> item <SUCCESS> tail */ /* <REPEAT_ONE> <skip> <1=min> <2=max> item <SUCCESS> tail */
TRACE(("%8d: max repeat one {%d,%d}\n", PTR(ptr), TRACE(("|%p|%p|REPEAT_ONE %d %d\n", pattern, ptr,
pattern[1], pattern[2])); pattern[1], pattern[2]));
if (ptr + pattern[1] > end) if (ptr + pattern[1] > end)
@ -814,14 +842,11 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
string. check if the rest of the pattern matches, string. check if the rest of the pattern matches,
and backtrack if not. */ and backtrack if not. */
TRACE(("%8d: repeat %d found\n", PTR(ptr), count));
if (count < (int) pattern[1]) if (count < (int) pattern[1])
return 0; return 0;
if (pattern[pattern[0]] == SRE_OP_SUCCESS) { if (pattern[pattern[0]] == SRE_OP_SUCCESS) {
/* tail is empty. we're finished */ /* tail is empty. we're finished */
TRACE(("%8d: tail is empty\n", PTR(ptr)));
state->ptr = ptr; state->ptr = ptr;
return 1; return 1;
@ -829,41 +854,39 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
/* tail starts with a literal. skip positions where /* tail starts with a literal. skip positions where
the rest of the pattern cannot possibly match */ the rest of the pattern cannot possibly match */
chr = pattern[pattern[0]+1]; chr = pattern[pattern[0]+1];
TRACE(("%8d: tail is literal %d\n", PTR(ptr), chr));
for (;;) { for (;;) {
TRACE(("%8d: scan for tail match\n", PTR(ptr)));
while (count >= (int) pattern[1] && while (count >= (int) pattern[1] &&
(ptr >= end || *ptr != chr)) { (ptr >= end || *ptr != chr)) {
ptr--; ptr--;
count--; count--;
} }
TRACE(("%8d: check tail\n", PTR(ptr)));
if (count < (int) pattern[1]) if (count < (int) pattern[1])
break; break;
state->ptr = ptr; state->ptr = ptr;
i = SRE_MATCH(state, pattern + pattern[0], level + 1); i = SRE_MATCH(state, pattern + pattern[0], level + 1);
if (i > 0) { if (i)
TRACE(("%8d: repeat %d picked\n", PTR(ptr), count));
return 1; return 1;
}
ptr--; ptr--;
count--; count--;
} }
} else { } else {
/* general case */ /* general case */
TRACE(("%8d: tail is pattern\n", PTR(ptr))); lastmark = state->lastmark;
while (count >= (int) pattern[1]) { while (count >= (int) pattern[1]) {
state->ptr = ptr; state->ptr = ptr;
i = SRE_MATCH(state, pattern + pattern[0], level + 1); i = SRE_MATCH(state, pattern + pattern[0], level + 1);
if (i < 0) if (i)
return i;
if (i) {
TRACE(("%8d: repeat %d picked\n", PTR(ptr), count));
return 1; return 1;
}
ptr--; ptr--;
count--; count--;
if (state->lastmark > lastmark) {
memset(
state->mark + lastmark + 1, 0,
(state->lastmark - lastmark) * sizeof(void*)
);
state->lastmark = lastmark;
}
} }
} }
return 0; return 0;
@ -872,7 +895,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
/* create repeat context. all the hard work is done /* create repeat context. all the hard work is done
by the UNTIL operator */ by the UNTIL operator */
/* <REPEAT> <skip> <1=min> <2=max> item <UNTIL> tail */ /* <REPEAT> <skip> <1=min> <2=max> item <UNTIL> tail */
TRACE(("%8d: repeat {%d,%d}\n", PTR(ptr), TRACE(("|%p|%p|REPEAT %d %d\n", pattern, ptr,
pattern[1], pattern[2])); pattern[1], pattern[2]));
rep.count = -1; rep.count = -1;
@ -904,11 +927,10 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
count = rp->count + 1; count = rp->count + 1;
TRACE(("%8d: max until %d\n", PTR(ptr), count)); TRACE(("|%p|%p|MAX_UNTIL %d\n", pattern, ptr, count));
if (count < rp->pattern[1]) { if (count < rp->pattern[1]) {
/* not enough matches */ /* not enough matches */
TRACE(("%8d: match item (required)\n", PTR(ptr)));
rp->count = count; rp->count = count;
/* RECURSIVE */ /* RECURSIVE */
i = SRE_MATCH(state, rp->pattern + 3, level + 1); i = SRE_MATCH(state, rp->pattern + 3, level + 1);
@ -920,7 +942,6 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
} }
if (count < rp->pattern[2] || rp->pattern[2] == 65535) { if (count < rp->pattern[2] || rp->pattern[2] == 65535) {
TRACE(("%8d: match item (optional)\n", PTR(ptr)));
/* we may have enough matches, but if we can /* we may have enough matches, but if we can
match another item, do so */ match another item, do so */
rp->count = count; rp->count = count;
@ -937,7 +958,6 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
/* cannot match more repeated items here. make sure the /* cannot match more repeated items here. make sure the
tail matches */ tail matches */
TRACE(("%8d: match tail\n", PTR(ptr)));
state->repeat = rp->prev; state->repeat = rp->prev;
i = SRE_MATCH(state, pattern, level + 1); i = SRE_MATCH(state, pattern, level + 1);
if (i) if (i)
@ -955,13 +975,12 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
count = rp->count + 1; count = rp->count + 1;
TRACE(("%8d: min until %d\n", PTR(ptr), count)); TRACE(("|%p|%p|MIN_UNTIL %d\n", pattern, ptr, count));
state->ptr = ptr; state->ptr = ptr;
if (count < rp->pattern[1]) { if (count < rp->pattern[1]) {
/* not enough matches */ /* not enough matches */
TRACE(("%8d: match item (required)\n", PTR(ptr)));
rp->count = count; rp->count = count;
/* RECURSIVE */ /* RECURSIVE */
i = SRE_MATCH(state, rp->pattern + 3, level + 1); i = SRE_MATCH(state, rp->pattern + 3, level + 1);
@ -973,7 +992,6 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
} }
/* see if the tail matches */ /* see if the tail matches */
TRACE(("%8d: match tail\n", PTR(ptr)));
state->repeat = rp->prev; state->repeat = rp->prev;
i = SRE_MATCH(state, pattern, level + 1); i = SRE_MATCH(state, pattern, level + 1);
if (i) { if (i) {
@ -985,7 +1003,6 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
if (count >= rp->pattern[2] && rp->pattern[2] != 65535) if (count >= rp->pattern[2] && rp->pattern[2] != 65535)
return 0; return 0;
TRACE(("%8d: match item (optional)\n", PTR(ptr)));
rp->count = count; rp->count = count;
/* RECURSIVE */ /* RECURSIVE */
i = SRE_MATCH(state, rp->pattern + 3, level + 1); i = SRE_MATCH(state, rp->pattern + 3, level + 1);
@ -995,7 +1012,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
return 0; return 0;
default: default:
TRACE(("%8d: unknown opcode %d\n", PTR(ptr), pattern[-1])); TRACE(("|%p|%p|UNKNOWN %d\n", pattern, ptr, pattern[-1]));
return SRE_ERROR_ILLEGAL; return SRE_ERROR_ILLEGAL;
} }
} }
@ -1011,6 +1028,7 @@ SRE_SEARCH(SRE_STATE* state, SRE_CODE* pattern)
SRE_CHAR* end = state->end; SRE_CHAR* end = state->end;
int status = 0; int status = 0;
int prefix_len = 0; int prefix_len = 0;
int prefix_skip;
SRE_CODE* prefix = NULL; SRE_CODE* prefix = NULL;
SRE_CODE* charset = NULL; SRE_CODE* charset = NULL;
SRE_CODE* overlap = NULL; SRE_CODE* overlap = NULL;
@ -1032,16 +1050,22 @@ SRE_SEARCH(SRE_STATE* state, SRE_CODE* pattern)
if (flags & SRE_INFO_PREFIX) { if (flags & SRE_INFO_PREFIX) {
/* pattern starts with a known prefix */ /* pattern starts with a known prefix */
/* <length> <skip> <prefix data> <overlap data> */
prefix_len = pattern[5]; prefix_len = pattern[5];
prefix = pattern + 6; prefix_skip = pattern[6];
prefix = pattern + 7;
overlap = prefix + prefix_len - 1; overlap = prefix + prefix_len - 1;
} else if (flags & SRE_INFO_CHARSET) } else if (flags & SRE_INFO_CHARSET)
/* pattern starts with a character from a known set */ /* pattern starts with a character from a known set */
/* <charset> */
charset = pattern + 5; charset = pattern + 5;
pattern += 1 + pattern[1]; pattern += 1 + pattern[1];
} }
TRACE(("prefix = %p %d %d\n", prefix, prefix_len, prefix_skip));
TRACE(("charset = %p\n", charset));
#if defined(USE_FAST_SEARCH) #if defined(USE_FAST_SEARCH)
if (prefix_len > 1) { if (prefix_len > 1) {
/* pattern starts with a known prefix. use the overlap /* pattern starts with a known prefix. use the overlap
@ -1058,12 +1082,12 @@ SRE_SEARCH(SRE_STATE* state, SRE_CODE* pattern)
} else { } else {
if (++i == prefix_len) { if (++i == prefix_len) {
/* found a potential match */ /* found a potential match */
TRACE(("%8d: === SEARCH === hit\n", PTR(ptr))); TRACE(("|%p|%p|SEARCH SCAN\n", pattern, ptr));
state->start = ptr - prefix_len + 1; state->start = ptr + 1 - prefix_len;
state->ptr = ptr + 1; state->ptr = ptr + 1 - prefix_len + prefix_skip;
if (flags & SRE_INFO_LITERAL) if (flags & SRE_INFO_LITERAL)
return 1; /* we got all of it */ return 1; /* we got all of it */
status = SRE_MATCH(state, pattern + 2*prefix_len, 1); status = SRE_MATCH(state, pattern + 2*prefix_skip, 1);
if (status != 0) if (status != 0)
return status; return status;
/* close but no cigar -- try again */ /* close but no cigar -- try again */
@ -1083,12 +1107,13 @@ SRE_SEARCH(SRE_STATE* state, SRE_CODE* pattern)
/* pattern starts with a literal character. this is used /* pattern starts with a literal character. this is used
for short prefixes, and if fast search is disabled */ for short prefixes, and if fast search is disabled */
SRE_CODE chr = pattern[1]; SRE_CODE chr = pattern[1];
end = state->end;
for (;;) { for (;;) {
while (ptr < end && (SRE_CODE) ptr[0] != chr) while (ptr < end && (SRE_CODE) ptr[0] != chr)
ptr++; ptr++;
if (ptr == end) if (ptr == end)
return 0; return 0;
TRACE(("%8d: === SEARCH === literal\n", PTR(ptr))); TRACE(("|%p|%p|SEARCH LITERAL\n", pattern, ptr));
state->start = ptr; state->start = ptr;
state->ptr = ++ptr; state->ptr = ++ptr;
status = SRE_MATCH(state, pattern + 2, 1); status = SRE_MATCH(state, pattern + 2, 1);
@ -1097,22 +1122,24 @@ SRE_SEARCH(SRE_STATE* state, SRE_CODE* pattern)
} }
} else if (charset) { } else if (charset) {
/* pattern starts with a character from a known set */ /* pattern starts with a character from a known set */
end = state->end;
for (;;) { for (;;) {
while (ptr < end && !SRE_MEMBER(charset, ptr[0])) while (ptr < end && !SRE_CHARSET(charset, ptr[0]))
ptr++; ptr++;
if (ptr == end) if (ptr == end)
return 0; return 0;
TRACE(("%8d: === SEARCH === charset\n", PTR(ptr))); TRACE(("|%p|%p|SEARCH CHARSET\n", pattern, ptr));
state->start = ptr; state->start = ptr;
state->ptr = ptr; state->ptr = ptr;
status = SRE_MATCH(state, pattern, 1); status = SRE_MATCH(state, pattern, 1);
if (status != 0) if (status != 0)
break; break;
ptr++;
} }
} else } else
/* general case */ /* general case */
while (ptr <= end) { while (ptr <= end) {
TRACE(("%8d: === SEARCH ===\n", PTR(ptr))); TRACE(("|%p|%p|SEARCH\n", pattern, ptr));
state->start = state->ptr = ptr++; state->start = state->ptr = ptr++;
status = SRE_MATCH(state, pattern, 1); status = SRE_MATCH(state, pattern, 1);
if (status != 0) if (status != 0)
@ -1480,6 +1507,8 @@ pattern_match(PatternObject* self, PyObject* args)
state.ptr = state.start; state.ptr = state.start;
TRACE(("|%p|%p|MATCH\n", PatternObject_GetCode(self), state.ptr));
if (state.charsize == 1) { if (state.charsize == 1) {
status = sre_match(&state, PatternObject_GetCode(self), 1); status = sre_match(&state, PatternObject_GetCode(self), 1);
} else { } else {
@ -1488,6 +1517,8 @@ pattern_match(PatternObject* self, PyObject* args)
#endif #endif
} }
TRACE(("|%p|%p|END\n", PatternObject_GetCode(self), state.ptr));
state_fini(&state); state_fini(&state);
return pattern_new_match(self, &state, status); return pattern_new_match(self, &state, status);
@ -1509,6 +1540,8 @@ pattern_search(PatternObject* self, PyObject* args)
if (!string) if (!string)
return NULL; return NULL;
TRACE(("|%p|%p|SEARCH\n", PatternObject_GetCode(self), state.ptr));
if (state.charsize == 1) { if (state.charsize == 1) {
status = sre_search(&state, PatternObject_GetCode(self)); status = sre_search(&state, PatternObject_GetCode(self));
} else { } else {
@ -1517,6 +1550,8 @@ pattern_search(PatternObject* self, PyObject* args)
#endif #endif
} }
TRACE(("|%p|%p|END\n", PatternObject_GetCode(self), state.ptr));
state_fini(&state); state_fini(&state);
return pattern_new_match(self, &state, status); return pattern_new_match(self, &state, status);