fix regex for some IMPORT ... FROM corner cases

This commit is contained in:
Ben Maddison 2021-05-20 13:49:57 +02:00
parent 0f898e0079
commit bac20bf348
1 changed files with 2 additions and 2 deletions

View File

@ -334,8 +334,8 @@ SYNT_RE_MODULEDEF = re.compile(
SYNT_RE_MODULEREF = re.compile(
'(?:^|\s{1})(%s){1}\s{0,}(\{[\s\-a-zA-Z0-9\(\)]{1,}\}){0,1}' % _RE_TYPEREF)
SYNT_RE_MODULEFROM = re.compile(
'(?:FROM\s{1,})(%s)\s{1,}' \
'(?:(\{[\s\-a-zA-Z0-9\(\)]{1,}\})|(%s)(?:\s{1,}%s\s{1,}(?:,|FROM)|\s{0,}$)){0,1}' \
'(?:FROM\s{1,})(%s)' \
'(?:\s{0,}(\{[\s\-a-zA-Z0-9\(\)]{1,}\})|\s{1,}(%s)(?:\s{1,}%s(?:\s*\{\})?(?:\s{0,},|\s{1,}FROM)|\s{0,}$)){0,1}' \
% (_RE_TYPEREF, _RE_IDENT, _RE_WORD))
SYNT_RE_MODULEEXP = re.compile(
'(?:^|\s{1})EXPORTS((.|\n)*?);')