diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2015-11-05 17:51:15 +0200 |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-11-05 17:51:15 +0200 |
commit | 7c1455be6be4f698889527e6e46086f229a73818 (patch) | |
tree | 44dc3b5ab7c764e09f4df675b56b218585f09d43 /Lib | |
parent | 12b2538ab8e44d69d9ed2c8b329812130db9e6bc (diff) | |
parent | b5d0a215536c0b5b7d100f54aad9968b4760122c (diff) | |
download | cpython-git-7c1455be6be4f698889527e6e46086f229a73818.tar.gz |
Issue #25554: Got rid of circular references in regular expression parsing.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/sre_parse.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py index 67f84e940f..f6a88517df 100644 --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -70,14 +70,14 @@ class Pattern: def __init__(self): self.flags = 0 self.groupdict = {} - self.subpatterns = [None] # group 0 + self.groupwidths = [None] # group 0 self.lookbehindgroups = None @property def groups(self): - return len(self.subpatterns) + return len(self.groupwidths) def opengroup(self, name=None): gid = self.groups - self.subpatterns.append(None) + self.groupwidths.append(None) if self.groups > MAXGROUPS: raise error("too many groups") if name is not None: @@ -88,9 +88,9 @@ class Pattern: self.groupdict[name] = gid return gid def closegroup(self, gid, p): - self.subpatterns[gid] = p + self.groupwidths[gid] = p.getwidth() def checkgroup(self, gid): - return gid < self.groups and self.subpatterns[gid] is not None + return gid < self.groups and self.groupwidths[gid] is not None def checklookbehindgroup(self, gid, source): if self.lookbehindgroups is not None: @@ -195,7 +195,7 @@ class SubPattern: lo = lo + 1 hi = hi + 1 elif op is GROUPREF: - i, j = self.pattern.subpatterns[av].getwidth() + i, j = self.pattern.groupwidths[av] lo = lo + i hi = hi + j elif op is GROUPREF_EXISTS: |