mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

sre.Scanner fixes (from Greg Chapman). also added a Scanner sanity

Browse source 
check to the test suite.

added a few missing exception checks in the _sre module
This commit is contained in:
Fredrik Lundh 2001-10-21 18:04:11 +00:00
parent bec95b9d88
commit 1296a8d77e
3 changed files with 43 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/sre.py
View file

@ -330,15 +330,16 @@ copy_reg.pickle(_pattern_type, _pickle, _compile)
# experimental stuff (see python-dev discussions for details)
class Scanner:
def __init__(self, lexicon):
def __init__(self, lexicon, flags=0):
from sre_constants import BRANCH, SUBPATTERN
self.lexicon = lexicon
# combine phrases into a compound pattern
p = []
s = sre_parse.Pattern()
s.flags = flags
for phrase, action in lexicon:
p.append(sre_parse.SubPattern(s, [
(SUBPATTERN, (len(p), sre_parse.parse(phrase))),
(SUBPATTERN, (len(p)+1, sre_parse.parse(phrase, flags))),
]))
p = sre_parse.SubPattern(s, [(BRANCH, (None, p))])
s.groups = len(p)
@ -346,16 +347,16 @@ class Scanner:
def scan(self, string):
result = []
append = result.append
match = self.scanner.match
match = self.scanner.scanner(string).match
i = 0
while 1:
m = match(string, i)
m = match()
if not m:
break
j = m.end()
if i == j:
break
action = self.lexicon[m.lastindex][1]
action = self.lexicon[m.lastindex-1][1]
if callable(action):
self.match = m
action = action(self, m.group())