mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-12 13:55:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

-- tightened up parsing of octal numbers

Browse source 
-- improved the SRE test harness: don't use asserts, test a few more
   things (including more boundary conditions)
This commit is contained in:
Fredrik Lundh 2000-09-02 11:03:34 +00:00
parent 412f246024
commit 143328ba63
3 changed files with 157 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/sre_parse.py
View file

@ -15,7 +15,7 @@ from sre_constants import *
MAXREPEAT = 65535
SPECIAL_CHARS = ".\\[{()*+?^$|"
REPEAT_CHARS = "*+?{"
REPEAT_CHARS = "*+?{"
DIGITS = tuple("0123456789")
@ -259,13 +259,12 @@ def _escape(source, escape, state):
# hexadecimal escape
while source.next in HEXDIGITS and len(escape) < 4:
escape = escape + source.get()
escape = escape[2:]
if len(escape) != 2:
raise error, "bogus escape: %s" % repr("\\" + escape)
return LITERAL, int(escape, 16) & 0xff
if len(escape) != 4:
raise ValueError
return LITERAL, int(escape[2:], 16) & 0xff
elif escape[1:2] == "0":
# octal escape
while source.next in OCTDIGITS and len(escape) < 5:
while source.next in OCTDIGITS and len(escape) < 4:
escape = escape + source.get()
return LITERAL, int(escape[1:], 8) & 0xff
elif escape[1:2] in DIGITS:
@ -273,7 +272,8 @@ def _escape(source, escape, state):
here = source.tell()
if source.next in DIGITS:
escape = escape + source.get()
if escape[2] in OCTDIGITS and source.next in OCTDIGITS:
if (escape[1] in OCTDIGITS and escape[2] in OCTDIGITS and
source.next in OCTDIGITS):
# got three octal digits; this is an octal escape
escape = escape + source.get()
return LITERAL, int(escape[1:], 8) & 0xff
@ -281,7 +281,7 @@ def _escape(source, escape, state):
group = _group(escape, state.groups)
if group:
return GROUPREF, group
raise error, "bogus escape: %s" % repr(escape)
raise ValueError
if len(escape) == 2:
return LITERAL, ord(escape[1])
except ValueError: