[pypy-commit] pypy unicode-utf8-re: tweak

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: unicode-utf8-re
Changeset: r93248:7efa0e2d1448
Date: 2017-12-03 16:04 +0100
http://bitbucket.org/pypy/pypy/changeset/7efa0e2d1448/

Log:	tweak

diff --git a/rpython/rlib/rsre/rsre_core.py b/rpython/rlib/rsre/rsre_core.py
--- a/rpython/rlib/rsre/rsre_core.py
+++ b/rpython/rlib/rsre/rsre_core.py
@@ -1219,12 +1219,10 @@
                 assert start >= ctx.ZERO
                 prefix_skip = ctx.pat(6)
                 if prefix_skip >= prefix_len - 1:
-                    try:
-                        ptr = ctx.next_n(string_position,
-                                         prefix_skip - (prefix_len - 1),
-                                         ctx.end)
-                    except EndOfString:
-                        ptr = -1
+                    assert prefix_skip <= prefix_len
+                    ptr = string_position
+                    if prefix_skip == prefix_len:
+                        ptr = ctx.next(ptr)
                 else:
                     assert prefix_skip < prefix_len - 1
                     j_prefix_skip = j + prefix_skip
@@ -1240,8 +1238,7 @@
                 #    return True
                 pattern_offset = ctx.pat(1) + 1
                 ppos_start = pattern_offset + 2 * prefix_skip
-                if (ptr >= ctx.ZERO and
-                        sre_match(ctx, ppos_start, ptr, None) is not None):
+                if sre_match(ctx, ppos_start, ptr, None) is not None:
                     ctx.match_start = start
                     return True
                 overlap_offset = prefix_len + (7 - 1)