traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New from Jeffrey; small nits.

This commit is contained in:
Guido van Rossum 1997-07-11 21:10:17 +00:00
parent 8a9a4a2336
commit 5d6de256d5
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/re.py
View File

@ -350,6 +350,7 @@ class SyntaxSpec(Instruction):
self.syntax = syntax self.syntax = syntax
Instruction.__init__(self, chr(20), 2) Instruction.__init__(self, chr(20), 2)
def assemble(self, postition, labels): def assemble(self, postition, labels):
# XXX
return self.opcode + chr(self.syntax) return self.opcode + chr(self.syntax)
class NotSyntaxSpec(Instruction): class NotSyntaxSpec(Instruction):
@ -358,6 +359,7 @@ class NotSyntaxSpec(Instruction):
self.syntax = syntax self.syntax = syntax
Instruction.__init__(self, chr(21), 2) Instruction.__init__(self, chr(21), 2)
def assemble(self, postition, labels): def assemble(self, postition, labels):
# XXX
return self.opcode + chr(self.syntax) return self.opcode + chr(self.syntax)
class Label(Instruction): class Label(Instruction):
@ -373,11 +375,15 @@ class OpenParen(Instruction):
def __init__(self, register): def __init__(self, register):
self.register = register self.register = register
Instruction.__init__(self, '', 0) Instruction.__init__(self, '', 0)
def assemble(self, position, labels):
raise error, 'unmatched open parenthesis'
class Alternation(Instruction): class Alternation(Instruction):
name = '|' name = '|'
def __init__(self): def __init__(self):
Instruction.__init__(self, '', 0) Instruction.__init__(self, '', 0)
def assemble(self, position, labels):
raise error, 'an alternation was not taken care of'
# #
# #
@ -924,7 +930,9 @@ def compile(pattern, flags=0):
elif char == '*': elif char == '*':
# Kleene closure # Kleene closure
if len(stack) == 0: if len(stack) == 0:
raise error, 'the Kleene closure needs something to repeat' raise error, '* needs something to repeat'
if (stack[-1][0].name == '(') or (stack[-1][0].name == '|'):
raise error, '* needs something to repeat'
registers = registers_used(stack[-1]) registers = registers_used(stack[-1])
if (index < len(pattern)) and (pattern[index] == '?'): if (index < len(pattern)) and (pattern[index] == '?'):
# non-greedy matching # non-greedy matching
@ -948,7 +956,9 @@ def compile(pattern, flags=0):
elif char == '+': elif char == '+':
# positive closure # positive closure
if len(stack) == 0: if len(stack) == 0:
raise error, 'the positive closure needs something to repeat' raise error, '+ needs something to repeat'
if (stack[-1][0].name == '(') or (stack[-1][0].name == '|'):
raise error, '+ needs something to repeat'
registers = registers_used(stack[-1]) registers = registers_used(stack[-1])
if (index < len(pattern)) and (pattern[index] == '?'): if (index < len(pattern)) and (pattern[index] == '?'):
# non-greedy # non-greedy