- changed sre.Scanner to use lastindex instead of index.
This commit is contained in:
parent
c2301730b8
commit
019bcb598d
|
@ -165,7 +165,7 @@ class Scanner:
|
||||||
p = []
|
p = []
|
||||||
for phrase, action in lexicon:
|
for phrase, action in lexicon:
|
||||||
p.append("(?:%s)(?P#%d)" % (phrase, len(p)))
|
p.append("(?:%s)(?P#%d)" % (phrase, len(p)))
|
||||||
self.scanner = sre.compile("|".join(p))
|
self.scanner = _compile("|".join(p))
|
||||||
def scan(self, string):
|
def scan(self, string):
|
||||||
result = []
|
result = []
|
||||||
append = result.append
|
append = result.append
|
||||||
|
@ -178,7 +178,7 @@ class Scanner:
|
||||||
j = m.end()
|
j = m.end()
|
||||||
if i == j:
|
if i == j:
|
||||||
break
|
break
|
||||||
action = self.lexicon[m.index][1]
|
action = self.lexicon[m.lastindex][1]
|
||||||
if callable(action):
|
if callable(action):
|
||||||
self.match = match
|
self.match = match
|
||||||
action = action(self, m.group())
|
action = action(self, m.group())
|
||||||
|
|
Loading…
Reference in New Issue