[Python-checkins] gh-102737: Un-ignore ceval.c in the CI globals check (gh-102745)
ericsnowcurrently
webhook-mailer at python.org
Thu Mar 16 11:27:04 EDT 2023
https://github.com/python/cpython/commit/84e20c689a8b3b6cebfd50d044c62af5d0e7dec1
commit: 84e20c689a8b3b6cebfd50d044c62af5d0e7dec1
branch: main
author: Eric Snow <ericsnowcurrently at gmail.com>
committer: ericsnowcurrently <ericsnowcurrently at gmail.com>
date: 2023-03-16T09:26:42-06:00
summary:
gh-102737: Un-ignore ceval.c in the CI globals check (gh-102745)
The tool now allows user-added #LINE preprocessor directives.
https://github.com/python/cpython/issues/102737
files:
M Tools/c-analyzer/c_parser/preprocessor/gcc.py
M Tools/c-analyzer/cpython/_parser.py
diff --git a/Tools/c-analyzer/c_parser/preprocessor/gcc.py b/Tools/c-analyzer/c_parser/preprocessor/gcc.py
index 24c1b0e9b9d4..c680f351f224 100644
--- a/Tools/c-analyzer/c_parser/preprocessor/gcc.py
+++ b/Tools/c-analyzer/c_parser/preprocessor/gcc.py
@@ -153,9 +153,13 @@ def _iter_top_include_lines(lines, topfile, cwd,
# XXX How can a file return to line 1?
#assert lno > 1, (line, lno)
else:
- # It's the next line from the file.
- assert included == files[-1], (line, files)
- assert lno > 1, (line, lno)
+ if included == files[-1]:
+ # It's the next line from the file.
+ assert lno > 1, (line, lno)
+ else:
+ # We ran into a user-added #LINE directive,
+ # which we promptly ignore.
+ pass
elif not files:
raise NotImplementedError((line,))
elif filter_reqfile(files[-1]):
diff --git a/Tools/c-analyzer/cpython/_parser.py b/Tools/c-analyzer/cpython/_parser.py
index a2911e030ffe..acf30e2c4020 100644
--- a/Tools/c-analyzer/cpython/_parser.py
+++ b/Tools/c-analyzer/cpython/_parser.py
@@ -96,10 +96,6 @@ def clean_lines(text):
# has gone wrong where # we handle "maybe inline actual"
# in Tools/c-analyzer/c_parser/parser/_global.py.
Modules/expat/xmlparse.c
-
-# The parser doesn't like the #line directives
-# that originate from generated_cases.c.h
-Python/ceval.c
''')
INCL_DIRS = clean_lines('''
More information about the Python-checkins
mailing list