hiro/melpazoid
1
0
Fork 0
mirror of https://github.com/vale981/melpazoid synced 2025-03-04 17:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve errors when Package-Requires fails tokenize()

Browse source
This commit is contained in:
riscy 2024-09-02 12:43:40 -07:00
parent b099fc75df
commit c285d3a597
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
melpazoid/melpazoid.py
View file

@ -189,10 +189,10 @@ def _tokenize_expression(expression: str) -> list[str]:
lexer.wordchars = lexer.wordchars + "':-" lexer.wordchars = lexer.wordchars + "':-"
tokens = list(lexer) tokens = list(lexer)
unbalanced_parens = 0 unbalanced_parens = 0
for token in tokens: for t in tokens:
if token == '(': if t == '(':
unbalanced_parens += 1 unbalanced_parens += 1
if token == ')': if t == ')':
unbalanced_parens -= 1 unbalanced_parens -= 1
if unbalanced_parens < 0: if unbalanced_parens < 0:
break break
@ -277,10 +277,13 @@ def requirements(files: list[Path]) -> set[str]:
reqs: set[str] = set() reqs: set[str] = set()
for file_ in (f for f in files if f.is_file()): for file_ in (f for f in files if f.is_file()):
with file_.open(encoding='utf-8', errors='replace') as stream: with file_.open(encoding='utf-8', errors='replace') as stream:
if file_.name.endswith('-pkg.el'): try:
reqs = reqs.union(_reqs_from_pkg_el(stream)) if file_.name.endswith('-pkg.el'):
elif file_.name.endswith('.el'): reqs = reqs.union(_reqs_from_pkg_el(stream))
reqs = reqs.union(_reqs_from_el_file(stream)) elif file_.name.endswith('.el'):
reqs = reqs.union(_reqs_from_el_file(stream))
except ValueError as err:
_fail(f"Couldn't parse requirements in {file_.name}: {err}")
return reqs return reqs
@ -309,13 +312,12 @@ def _reqs_from_el_file(el_file: TextIO) -> set[str]:
>>> _reqs_from_el_file(io.StringIO(';; package-requires: ((emacs "24.4"))')) >>> _reqs_from_el_file(io.StringIO(';; package-requires: ((emacs "24.4"))'))
{'emacs "24.4"'} {'emacs "24.4"'}
""" """
# TODO: if Package-Requires crosses multiple lines, parsing will fail.
# This is also currently an issue with package-lint (2024/09/02)
for line in el_file: for line in el_file:
match = re.match(r'[; ]*Package-Requires[ ]*:[ ]*(.*)$', line, re.I) match = re.match(r'[; ]*Package-Requires[ ]*:[ ]*(.*)$', line, re.I)
if match: if match:
try: _tokenize_expression(match.groups()[0])
_tokenize_expression(match.groups()[0])
except ValueError as err:
_fail(str(err))
return { return {
req.replace(')', '').strip().lower() req.replace(')', '').strip().lower()
for req in re.split('[()]', match.groups()[0]) for req in re.split('[()]', match.groups()[0])