Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gh-102737: Un-ignore ceval.c in the CI globals check #102745

Merged
merged 2 commits into from
Mar 16, 2023
Merged

gh-102737: Un-ignore ceval.c in the CI globals check #102745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e16dc18
Un-ignore ceval.c.
ericsnowcurrently Mar 16, 2023
575089a
Allow user-added #LINE directives.
ericsnowcurrently Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Tools/c-analyzer/c_parser/preprocessor/gcc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]):
Expand Down
4 changes: 0 additions & 4 deletions Tools/c-analyzer/cpython/_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('''
Expand Down