[Python-checkins] CVS: python/dist/src/Modules _sre.c,2.33,2.34
Fredrik Lundh
python-dev@python.org
Mon, 7 Aug 2000 13:59:08 -0700
Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11293/Modules
Modified Files:
_sre.c
Log Message:
-- 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
Index: _sre.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_sre.c,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -r2.33 -r2.34
*** _sre.c 2000/08/07 17:33:38 2.33
--- _sre.c 2000/08/07 20:59:04 2.34
***************
*** 14,19 ****
* 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-02 fl moved SRE_COUNT out of the match method
* 00-08-03 fl added recursion limit
*
* Copyright (c) 1997-2000 by Secret Labs AB. All rights reserved.
--- 14,19 ----
* 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-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.
***************
*** 94,99 ****
#endif
- #define PTR(ptr) ((SRE_CHAR*) (ptr) - (SRE_CHAR*) state->beginning)
-
/* -------------------------------------------------------------------- */
/* search engine state */
--- 94,97 ----
***************
*** 266,270 ****
}
! TRACE(("copy %d:%d to %d\n", lo, hi, state->mark_stack_base));
memcpy(state->mark_stack + state->mark_stack_base, state->mark + lo,
--- 264,268 ----
}
! 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,
***************
*** 301,305 ****
#define SRE_AT sre_at
#define SRE_COUNT sre_count
! #define SRE_MEMBER sre_member
#define SRE_MATCH sre_match
#define SRE_SEARCH sre_search
--- 299,304 ----
#define SRE_AT sre_at
#define SRE_COUNT sre_count
! #define SRE_CHARSET sre_charset
! #define SRE_INFO sre_info
#define SRE_MATCH sre_match
#define SRE_SEARCH sre_search
***************
*** 313,317 ****
#undef SRE_SEARCH
#undef SRE_MATCH
! #undef SRE_MEMBER
#undef SRE_COUNT
#undef SRE_AT
--- 312,317 ----
#undef SRE_SEARCH
#undef SRE_MATCH
! #undef SRE_INFO
! #undef SRE_CHARSET
#undef SRE_COUNT
#undef SRE_AT
***************
*** 323,327 ****
#define SRE_AT sre_uat
#define SRE_COUNT sre_ucount
! #define SRE_MEMBER sre_umember
#define SRE_MATCH sre_umatch
#define SRE_SEARCH sre_usearch
--- 323,328 ----
#define SRE_AT sre_uat
#define SRE_COUNT sre_ucount
! #define SRE_CHARSET sre_ucharset
! #define SRE_INFO sre_uinfo
#define SRE_MATCH sre_umatch
#define SRE_SEARCH sre_usearch
***************
*** 384,388 ****
LOCAL(int)
! SRE_MEMBER(SRE_CODE* set, SRE_CODE ch)
{
/* check if character is a member of the given set */
--- 385,389 ----
LOCAL(int)
! SRE_CHARSET(SRE_CODE* set, SRE_CODE ch)
{
/* check if character is a member of the given set */
***************
*** 454,457 ****
--- 455,459 ----
case SRE_OP_ANY:
/* repeated dot wildcard. */
+ TRACE(("|%p|%p|COUNT ANY\n", pattern, ptr));
while (ptr < end && !SRE_IS_LINEBREAK(*ptr))
ptr++;
***************
*** 461,464 ****
--- 463,467 ----
/* repeated dot wildcare. skip to the end of the target
string, and backtrack from there */
+ TRACE(("|%p|%p|COUNT ANY_ALL\n", pattern, ptr));
ptr = end;
break;
***************
*** 467,470 ****
--- 470,474 ----
/* repeated literal */
chr = pattern[1];
+ TRACE(("|%p|%p|COUNT LITERAL %d\n", pattern, ptr, chr));
while (ptr < end && (SRE_CODE) *ptr == chr)
ptr++;
***************
*** 474,477 ****
--- 478,482 ----
/* repeated literal */
chr = pattern[1];
+ TRACE(("|%p|%p|COUNT LITERAL_IGNORE %d\n", pattern, ptr, chr));
while (ptr < end && (SRE_CODE) state->lower(*ptr) == chr)
ptr++;
***************
*** 481,484 ****
--- 486,490 ----
/* repeated non-literal */
chr = pattern[1];
+ TRACE(("|%p|%p|COUNT NOT_LITERAL %d\n", pattern, ptr, chr));
while (ptr < end && (SRE_CODE) *ptr != chr)
ptr++;
***************
*** 488,491 ****
--- 494,498 ----
/* repeated non-literal */
chr = pattern[1];
+ TRACE(("|%p|%p|COUNT NOT_LITERAL_IGNORE %d\n", pattern, ptr, chr));
while (ptr < end && (SRE_CODE) state->lower(*ptr) != chr)
ptr++;
***************
*** 494,498 ****
case SRE_OP_IN:
/* repeated set */
! while (ptr < end && SRE_MEMBER(pattern + 2, *ptr))
ptr++;
break;
--- 501,506 ----
case SRE_OP_IN:
/* repeated set */
! TRACE(("|%p|%p|COUNT IN\n", pattern, ptr));
! while (ptr < end && SRE_CHARSET(pattern + 2, *ptr))
ptr++;
break;
***************
*** 500,503 ****
--- 508,512 ----
default:
/* repeated single character pattern */
+ TRACE(("|%p|%p|COUNT SUBPATTERN\n", pattern, ptr));
while ((SRE_CHAR*) state->ptr < end) {
i = SRE_MATCH(state, pattern, level);
***************
*** 507,517 ****
--- 516,555 ----
break;
}
+ TRACE(("|%p|%p|COUNT %d\n", pattern, ptr,
+ (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;
}
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)
SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
{
***************
*** 528,532 ****
SRE_REPEAT rep; /* FIXME: <fl> allocate in STATE instead */
! TRACE(("%8d: enter %d\n", PTR(ptr), level));
#if defined(USE_STACKCHECK)
--- 566,570 ----
SRE_REPEAT rep; /* FIXME: <fl> allocate in STATE instead */
! TRACE(("|%p|%p|ENTER %d\n", pattern, ptr, level));
#if defined(USE_STACKCHECK)
***************
*** 557,566 ****
case SRE_OP_FAILURE:
/* immediate failure */
! TRACE(("%8d: failure\n", PTR(ptr)));
return 0;
case SRE_OP_SUCCESS:
/* end of pattern */
! TRACE(("%8d: success\n", PTR(ptr)));
state->ptr = ptr;
return 1;
--- 595,604 ----
case SRE_OP_FAILURE:
/* immediate failure */
! TRACE(("|%p|%p|FAILURE\n", pattern, ptr));
return 0;
case SRE_OP_SUCCESS:
/* end of pattern */
! TRACE(("|%p|%p|SUCCESS\n", pattern, ptr));
state->ptr = ptr;
return 1;
***************
*** 569,573 ****
/* match at given position */
/* <AT> <code> */
! TRACE(("%8d: position %d\n", PTR(ptr), *pattern));
if (!SRE_AT(state, ptr, *pattern))
return 0;
--- 607,611 ----
/* match at given position */
/* <AT> <code> */
! TRACE(("|%p|%p|AT %d\n", pattern, ptr, *pattern));
if (!SRE_AT(state, ptr, *pattern))
return 0;
***************
*** 578,586 ****
/* match at given category */
/* <CATEGORY> <code> */
! TRACE(("%8d: category %d [category %d]\n", PTR(ptr),
! *ptr, *pattern));
if (ptr >= end || !sre_category(pattern[0], ptr[0]))
return 0;
- TRACE(("%8d: category ok\n", PTR(ptr)));
pattern++;
ptr++;
--- 616,622 ----
/* match at given category */
/* <CATEGORY> <code> */
! TRACE(("|%p|%p|CATEGORY %d\n", pattern, ptr, *pattern));
if (ptr >= end || !sre_category(pattern[0], ptr[0]))
return 0;
pattern++;
ptr++;
***************
*** 590,594 ****
/* match literal string */
/* <LITERAL> <code> */
! TRACE(("%8d: literal %c\n", PTR(ptr), pattern[0]));
if (ptr >= end || (SRE_CODE) ptr[0] != pattern[0])
return 0;
--- 626,630 ----
/* match literal string */
/* <LITERAL> <code> */
! TRACE(("|%p|%p|LITERAL %d\n", pattern, ptr, *pattern));
if (ptr >= end || (SRE_CODE) ptr[0] != pattern[0])
return 0;
***************
*** 600,604 ****
/* match anything that is not literal character */
/* <NOT_LITERAL> <code> */
! TRACE(("%8d: literal not %c\n", PTR(ptr), pattern[0]));
if (ptr >= end || (SRE_CODE) ptr[0] == pattern[0])
return 0;
--- 636,640 ----
/* match anything that is not literal character */
/* <NOT_LITERAL> <code> */
! TRACE(("|%p|%p|NOT_LITERAL %d\n", pattern, ptr, *pattern));
if (ptr >= end || (SRE_CODE) ptr[0] == pattern[0])
return 0;
***************
*** 610,614 ****
/* match anything (except a newline) */
/* <ANY> */
! TRACE(("%8d: anything (except newline)\n", PTR(ptr)));
if (ptr >= end || SRE_IS_LINEBREAK(ptr[0]))
return 0;
--- 646,650 ----
/* match anything (except a newline) */
/* <ANY> */
! TRACE(("|%p|%p|ANY\n", pattern, ptr));
if (ptr >= end || SRE_IS_LINEBREAK(ptr[0]))
return 0;
***************
*** 619,623 ****
/* match anything */
/* <ANY_ALL> */
! TRACE(("%8d: anything\n", PTR(ptr)));
if (ptr >= end)
return 0;
--- 655,659 ----
/* match anything */
/* <ANY_ALL> */
! TRACE(("|%p|%p|ANY_ALL\n", pattern, ptr));
if (ptr >= end)
return 0;
***************
*** 628,633 ****
/* match set member (or non_member) */
/* <IN> <skip> <set> */
! TRACE(("%8d: set %c\n", PTR(ptr), *ptr));
! if (ptr >= end || !SRE_MEMBER(pattern + 1, *ptr))
return 0;
pattern += pattern[0];
--- 664,669 ----
/* match set member (or non_member) */
/* <IN> <skip> <set> */
! TRACE(("|%p|%p|IN\n", pattern, ptr));
! if (ptr >= end || !SRE_CHARSET(pattern + 1, *ptr))
return 0;
pattern += pattern[0];
***************
*** 637,641 ****
case SRE_OP_GROUPREF:
/* match backreference */
! TRACE(("%8d: group %d\n", PTR(ptr), pattern[0]));
i = pattern[0];
{
--- 673,677 ----
case SRE_OP_GROUPREF:
/* match backreference */
! TRACE(("|%p|%p|GROUPREF %d\n", pattern, ptr, pattern[0]));
i = pattern[0];
{
***************
*** 655,659 ****
case SRE_OP_GROUPREF_IGNORE:
/* match backreference */
! TRACE(("%8d: group ignore %d\n", PTR(ptr), pattern[0]));
i = pattern[0];
{
--- 691,695 ----
case SRE_OP_GROUPREF_IGNORE:
/* match backreference */
! TRACE(("|%p|%p|GROUPREF_IGNORE %d\n", pattern, ptr, pattern[0]));
i = pattern[0];
{
***************
*** 673,677 ****
case SRE_OP_LITERAL_IGNORE:
! TRACE(("%8d: literal lower(%c)\n", PTR(ptr), pattern[0]));
if (ptr >= end ||
state->lower(*ptr) != state->lower(*pattern))
--- 709,713 ----
case SRE_OP_LITERAL_IGNORE:
! TRACE(("|%p|%p|LITERAL_IGNORE %d\n", pattern, ptr, pattern[0]));
if (ptr >= end ||
state->lower(*ptr) != state->lower(*pattern))
***************
*** 682,686 ****
case SRE_OP_NOT_LITERAL_IGNORE:
! TRACE(("%8d: literal not lower(%c)\n", PTR(ptr), pattern[0]));
if (ptr >= end ||
state->lower(*ptr) == state->lower(*pattern))
--- 718,722 ----
case SRE_OP_NOT_LITERAL_IGNORE:
! TRACE(("|%p|%p|NOT_LITERAL_IGNORE %d\n", pattern, ptr, *pattern));
if (ptr >= end ||
state->lower(*ptr) == state->lower(*pattern))
***************
*** 691,697 ****
case SRE_OP_IN_IGNORE:
! TRACE(("%8d: set lower(%c)\n", PTR(ptr), *ptr));
if (ptr >= end
! || !SRE_MEMBER(pattern + 1, (SRE_CODE) state->lower(*ptr)))
return 0;
pattern += pattern[0];
--- 727,733 ----
case SRE_OP_IN_IGNORE:
! TRACE(("|%p|%p|IN_IGNORE\n", pattern, ptr));
if (ptr >= end
! || !SRE_CHARSET(pattern + 1, (SRE_CODE) state->lower(*ptr)))
return 0;
pattern += pattern[0];
***************
*** 702,706 ****
/* set mark */
/* <MARK> <gid> */
! TRACE(("%8d: set mark %d\n", PTR(ptr), pattern[0]));
i = pattern[0];
if (i & 1)
--- 738,742 ----
/* set mark */
/* <MARK> <gid> */
! TRACE(("|%p|%p|MARK %d\n", pattern, ptr, pattern[0]));
i = pattern[0];
if (i & 1)
***************
*** 716,720 ****
/* jump forward */
/* <JUMP> <offset> */
! TRACE(("%8d: jump +%d\n", PTR(ptr), pattern[0]));
pattern += pattern[0];
break;
--- 752,756 ----
/* jump forward */
/* <JUMP> <offset> */
! TRACE(("|%p|%p|JUMP %d\n", pattern, ptr, pattern[0]));
pattern += pattern[0];
break;
***************
*** 723,727 ****
/* assert subpattern */
/* <ASSERT> <skip> <back> <pattern> */
! TRACE(("%8d: assert subpattern %d\n", PTR(ptr), pattern[1]));
state->ptr = ptr - pattern[1];
if (state->ptr < state->beginning)
--- 759,763 ----
/* assert subpattern */
/* <ASSERT> <skip> <back> <pattern> */
! TRACE(("|%p|%p|ASSERT %d\n", pattern, ptr, pattern[1]));
state->ptr = ptr - pattern[1];
if (state->ptr < state->beginning)
***************
*** 738,742 ****
/* assert not subpattern */
/* <ASSERT_NOT> <skip> <back> <pattern> */
! TRACE(("%8d: assert not subpattern %d\n", PTR(ptr), pattern[1]));
state->ptr = ptr - pattern[1];
if (state->ptr < state->beginning)
--- 774,778 ----
/* assert not subpattern */
/* <ASSERT_NOT> <skip> <back> <pattern> */
! TRACE(("|%p|%p|ASSERT_NOT %d\n", pattern, ptr, pattern[1]));
state->ptr = ptr - pattern[1];
if (state->ptr < state->beginning)
***************
*** 755,786 ****
/* alternation */
/* <BRANCH> <0=skip> code <JUMP> ... <NULL> */
! TRACE(("%8d: branch\n", PTR(ptr)));
lastmark = state->lastmark;
! while (pattern[0]) {
! SRE_CODE* code = pattern+1;
! TRACE(("%8d: try branch\n", PTR(ptr)));
! switch (code[0]) {
! case SRE_OP_IN:
! if (ptr >= end || !SRE_MEMBER(code + 2, ptr[0]))
! break;
! code += code[1] + 1;
! state->ptr = ptr + 1;
! goto branch;
! case SRE_OP_LITERAL:
! if (ptr >= end || (SRE_CODE) ptr[0] != code[1])
! break;
! code += 2;
! state->ptr = ptr + 1;
! goto branch;
! default:
! 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;
--- 791,814 ----
/* alternation */
/* <BRANCH> <0=skip> code <JUMP> ... <NULL> */
! TRACE(("|%p|%p|BRANCH\n", pattern, ptr));
lastmark = state->lastmark;
! for (; pattern[0]; pattern += pattern[0]) {
! if (pattern[1] == SRE_OP_LITERAL &&
! (ptr >= end || (SRE_CODE) *ptr != pattern[2]))
! continue;
! if (pattern[1] == SRE_OP_IN &&
! (ptr >= end || !SRE_CHARSET(pattern + 3, (SRE_CODE) *ptr)))
! continue;
! state->ptr = ptr;
! i = SRE_MATCH(state, pattern + 1, level + 1);
! if (i)
! return i;
! if (state->lastmark > lastmark) {
! memset(
! state->mark + lastmark + 1, 0,
! (state->lastmark - lastmark) * sizeof(void*)
! );
! state->lastmark = lastmark;
}
}
return 0;
***************
*** 796,800 ****
/* <REPEAT_ONE> <skip> <1=min> <2=max> item <SUCCESS> tail */
! TRACE(("%8d: max repeat one {%d,%d}\n", PTR(ptr),
pattern[1], pattern[2]));
--- 824,828 ----
/* <REPEAT_ONE> <skip> <1=min> <2=max> item <SUCCESS> tail */
! TRACE(("|%p|%p|REPEAT_ONE %d %d\n", pattern, ptr,
pattern[1], pattern[2]));
***************
*** 815,820 ****
and backtrack if not. */
- TRACE(("%8d: repeat %d found\n", PTR(ptr), count));
-
if (count < (int) pattern[1])
return 0;
--- 843,846 ----
***************
*** 822,826 ****
if (pattern[pattern[0]] == SRE_OP_SUCCESS) {
/* tail is empty. we're finished */
- TRACE(("%8d: tail is empty\n", PTR(ptr)));
state->ptr = ptr;
return 1;
--- 848,851 ----
***************
*** 830,836 ****
the rest of the pattern cannot possibly match */
chr = pattern[pattern[0]+1];
- TRACE(("%8d: tail is literal %d\n", PTR(ptr), chr));
for (;;) {
- TRACE(("%8d: scan for tail match\n", PTR(ptr)));
while (count >= (int) pattern[1] &&
(ptr >= end || *ptr != chr)) {
--- 855,859 ----
***************
*** 838,850 ****
count--;
}
- TRACE(("%8d: check tail\n", PTR(ptr)));
if (count < (int) pattern[1])
break;
state->ptr = ptr;
i = SRE_MATCH(state, pattern + pattern[0], level + 1);
! if (i > 0) {
! TRACE(("%8d: repeat %d picked\n", PTR(ptr), count));
return 1;
- }
ptr--;
count--;
--- 861,870 ----
count--;
}
if (count < (int) pattern[1])
break;
state->ptr = ptr;
i = SRE_MATCH(state, pattern + pattern[0], level + 1);
! if (i)
return 1;
ptr--;
count--;
***************
*** 853,868 ****
} else {
/* general case */
! TRACE(("%8d: tail is pattern\n", PTR(ptr)));
while (count >= (int) pattern[1]) {
state->ptr = ptr;
i = SRE_MATCH(state, pattern + pattern[0], level + 1);
! if (i < 0)
! return i;
! if (i) {
! TRACE(("%8d: repeat %d picked\n", PTR(ptr), count));
return 1;
- }
ptr--;
count--;
}
}
--- 873,891 ----
} else {
/* general case */
! lastmark = state->lastmark;
while (count >= (int) pattern[1]) {
state->ptr = ptr;
i = SRE_MATCH(state, pattern + pattern[0], level + 1);
! if (i)
return 1;
ptr--;
count--;
+ if (state->lastmark > lastmark) {
+ memset(
+ state->mark + lastmark + 1, 0,
+ (state->lastmark - lastmark) * sizeof(void*)
+ );
+ state->lastmark = lastmark;
+ }
}
}
***************
*** 873,877 ****
by the UNTIL operator */
/* <REPEAT> <skip> <1=min> <2=max> item <UNTIL> tail */
! TRACE(("%8d: repeat {%d,%d}\n", PTR(ptr),
pattern[1], pattern[2]));
--- 896,900 ----
by the UNTIL operator */
/* <REPEAT> <skip> <1=min> <2=max> item <UNTIL> tail */
! TRACE(("|%p|%p|REPEAT %d %d\n", pattern, ptr,
pattern[1], pattern[2]));
***************
*** 905,913 ****
count = rp->count + 1;
! TRACE(("%8d: max until %d\n", PTR(ptr), count));
if (count < rp->pattern[1]) {
/* not enough matches */
- TRACE(("%8d: match item (required)\n", PTR(ptr)));
rp->count = count;
/* RECURSIVE */
--- 928,935 ----
count = rp->count + 1;
! TRACE(("|%p|%p|MAX_UNTIL %d\n", pattern, ptr, count));
if (count < rp->pattern[1]) {
/* not enough matches */
rp->count = count;
/* RECURSIVE */
***************
*** 921,925 ****
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
match another item, do so */
--- 943,946 ----
***************
*** 938,942 ****
/* cannot match more repeated items here. make sure the
tail matches */
- TRACE(("%8d: match tail\n", PTR(ptr)));
state->repeat = rp->prev;
i = SRE_MATCH(state, pattern, level + 1);
--- 959,962 ----
***************
*** 956,960 ****
count = rp->count + 1;
! TRACE(("%8d: min until %d\n", PTR(ptr), count));
state->ptr = ptr;
--- 976,980 ----
count = rp->count + 1;
! TRACE(("|%p|%p|MIN_UNTIL %d\n", pattern, ptr, count));
state->ptr = ptr;
***************
*** 962,966 ****
if (count < rp->pattern[1]) {
/* not enough matches */
- TRACE(("%8d: match item (required)\n", PTR(ptr)));
rp->count = count;
/* RECURSIVE */
--- 982,985 ----
***************
*** 974,978 ****
/* see if the tail matches */
- TRACE(("%8d: match tail\n", PTR(ptr)));
state->repeat = rp->prev;
i = SRE_MATCH(state, pattern, level + 1);
--- 993,996 ----
***************
*** 986,990 ****
return 0;
- TRACE(("%8d: match item (optional)\n", PTR(ptr)));
rp->count = count;
/* RECURSIVE */
--- 1004,1007 ----
***************
*** 996,1000 ****
default:
! TRACE(("%8d: unknown opcode %d\n", PTR(ptr), pattern[-1]));
return SRE_ERROR_ILLEGAL;
}
--- 1013,1017 ----
default:
! TRACE(("|%p|%p|UNKNOWN %d\n", pattern, ptr, pattern[-1]));
return SRE_ERROR_ILLEGAL;
}
***************
*** 1012,1015 ****
--- 1029,1033 ----
int status = 0;
int prefix_len = 0;
+ int prefix_skip;
SRE_CODE* prefix = NULL;
SRE_CODE* charset = NULL;
***************
*** 1033,1041 ****
if (flags & SRE_INFO_PREFIX) {
/* pattern starts with a known prefix */
prefix_len = pattern[5];
! prefix = pattern + 6;
overlap = prefix + prefix_len - 1;
} else if (flags & SRE_INFO_CHARSET)
/* pattern starts with a character from a known set */
charset = pattern + 5;
--- 1051,1062 ----
if (flags & SRE_INFO_PREFIX) {
/* pattern starts with a known prefix */
+ /* <length> <skip> <prefix data> <overlap data> */
prefix_len = pattern[5];
! prefix_skip = pattern[6];
! prefix = pattern + 7;
overlap = prefix + prefix_len - 1;
} else if (flags & SRE_INFO_CHARSET)
/* pattern starts with a character from a known set */
+ /* <charset> */
charset = pattern + 5;
***************
*** 1043,1046 ****
--- 1064,1070 ----
}
+ TRACE(("prefix = %p %d %d\n", prefix, prefix_len, prefix_skip));
+ TRACE(("charset = %p\n", charset));
+
#if defined(USE_FAST_SEARCH)
if (prefix_len > 1) {
***************
*** 1059,1068 ****
if (++i == prefix_len) {
/* found a potential match */
! TRACE(("%8d: === SEARCH === hit\n", PTR(ptr)));
! state->start = ptr - prefix_len + 1;
! state->ptr = ptr + 1;
if (flags & SRE_INFO_LITERAL)
return 1; /* we got all of it */
! status = SRE_MATCH(state, pattern + 2*prefix_len, 1);
if (status != 0)
return status;
--- 1083,1092 ----
if (++i == prefix_len) {
/* found a potential match */
! TRACE(("|%p|%p|SEARCH SCAN\n", pattern, ptr));
! state->start = ptr + 1 - prefix_len;
! state->ptr = ptr + 1 - prefix_len + prefix_skip;
if (flags & SRE_INFO_LITERAL)
return 1; /* we got all of it */
! status = SRE_MATCH(state, pattern + 2*prefix_skip, 1);
if (status != 0)
return status;
***************
*** 1084,1087 ****
--- 1108,1112 ----
for short prefixes, and if fast search is disabled */
SRE_CODE chr = pattern[1];
+ end = state->end;
for (;;) {
while (ptr < end && (SRE_CODE) ptr[0] != chr)
***************
*** 1089,1093 ****
if (ptr == end)
return 0;
! TRACE(("%8d: === SEARCH === literal\n", PTR(ptr)));
state->start = ptr;
state->ptr = ++ptr;
--- 1114,1118 ----
if (ptr == end)
return 0;
! TRACE(("|%p|%p|SEARCH LITERAL\n", pattern, ptr));
state->start = ptr;
state->ptr = ++ptr;
***************
*** 1098,1107 ****
} else if (charset) {
/* pattern starts with a character from a known set */
for (;;) {
! while (ptr < end && !SRE_MEMBER(charset, ptr[0]))
ptr++;
if (ptr == end)
return 0;
! TRACE(("%8d: === SEARCH === charset\n", PTR(ptr)));
state->start = ptr;
state->ptr = ptr;
--- 1123,1133 ----
} else if (charset) {
/* pattern starts with a character from a known set */
+ end = state->end;
for (;;) {
! while (ptr < end && !SRE_CHARSET(charset, ptr[0]))
ptr++;
if (ptr == end)
return 0;
! TRACE(("|%p|%p|SEARCH CHARSET\n", pattern, ptr));
state->start = ptr;
state->ptr = ptr;
***************
*** 1109,1117 ****
if (status != 0)
break;
}
} else
/* general case */
while (ptr <= end) {
! TRACE(("%8d: === SEARCH ===\n", PTR(ptr)));
state->start = state->ptr = ptr++;
status = SRE_MATCH(state, pattern, 1);
--- 1135,1144 ----
if (status != 0)
break;
+ ptr++;
}
} else
/* general case */
while (ptr <= end) {
! TRACE(("|%p|%p|SEARCH\n", pattern, ptr));
state->start = state->ptr = ptr++;
status = SRE_MATCH(state, pattern, 1);
***************
*** 1481,1484 ****
--- 1508,1513 ----
state.ptr = state.start;
+ TRACE(("|%p|%p|MATCH\n", PatternObject_GetCode(self), state.ptr));
+
if (state.charsize == 1) {
status = sre_match(&state, PatternObject_GetCode(self), 1);
***************
*** 1489,1492 ****
--- 1518,1523 ----
}
+ TRACE(("|%p|%p|END\n", PatternObject_GetCode(self), state.ptr));
+
state_fini(&state);
***************
*** 1510,1513 ****
--- 1541,1546 ----
return NULL;
+ TRACE(("|%p|%p|SEARCH\n", PatternObject_GetCode(self), state.ptr));
+
if (state.charsize == 1) {
status = sre_search(&state, PatternObject_GetCode(self));
***************
*** 1517,1520 ****
--- 1550,1555 ----
#endif
}
+
+ TRACE(("|%p|%p|END\n", PatternObject_GetCode(self), state.ptr));
state_fini(&state);