diff options
author | Paul McGuire <ptmcg@austin.rr.com> | 2019-10-13 00:29:58 -0500 |
---|---|---|
committer | Paul McGuire <ptmcg@austin.rr.com> | 2019-10-13 00:29:58 -0500 |
commit | 417332636f38ff6afb966fa63c2f8fe341ca6b4d (patch) | |
tree | cacd9e9d2a9adf3c9e16c259789d12dc4495e567 /pyparsing.py | |
parent | 6ee198cf78bee62d602fbd8c9e7c7144be3fd3f2 (diff) | |
download | pyparsing-git-417332636f38ff6afb966fa63c2f8fe341ca6b4d.tar.gz |
Fix PrecededBy bug, issue #127
Diffstat (limited to 'pyparsing.py')
-rw-r--r-- | pyparsing.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pyparsing.py b/pyparsing.py index 91a313c..6c3c7ec 100644 --- a/pyparsing.py +++ b/pyparsing.py @@ -96,7 +96,7 @@ classes inherit from. Use the docstrings for examples of how to: """ __version__ = "3.0.0a1" -__versionTime__ = "27 Sep 2019 10:27 UTC" +__versionTime__ = "13 Oct 2019 05:28 UTC" __author__ = "Paul McGuire <ptmcg@users.sourceforge.net>" import string @@ -4426,6 +4426,7 @@ class PrecededBy(ParseElementEnhance): self.retreat = retreat self.errmsg = "not preceded by " + str(expr) self.skipWhitespace = False + self.parseAction.append(lambda s, l, t: t.__delitem__(slice(None, None))) def parseImpl(self, instring, loc=0, doActions=True): if self.exact: @@ -4436,19 +4437,18 @@ class PrecededBy(ParseElementEnhance): else: # retreat specified a maximum lookbehind window, iterate test_expr = self.expr + StringEnd() - instring_slice = instring[:loc] + instring_slice = instring[max(0, loc - self.retreat):loc] last_expr = ParseException(instring, loc, self.errmsg) - for offset in range(1, min(loc, self.retreat + 1)): + for offset in range(1, min(loc, self.retreat + 1)+1): try: - _, ret = test_expr._parse(instring_slice, loc - offset) + # print('trying', offset, instring_slice, repr(instring_slice[loc - offset:])) + _, ret = test_expr._parse(instring_slice, len(instring_slice) - offset) except ParseBaseException as pbe: last_expr = pbe else: break else: raise last_expr - # return empty list of tokens, but preserve any defined results names - del ret[:] return loc, ret |