Skip to content

GH-92266: Remove embedded tabs from c-analyzer/cpython/_parser.py #137622

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

Merged
AA-Turner merged 3 commits into from
Sep 17, 2025
Merged

GH-92266: Remove embedded tabs from c-analyzer/cpython/_parser.py #137622

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
847bccc
Remove embedded tabs from ``c-analyzer/cpython/_parser.py``
AA-Turner Aug 10, 2025
f1cfdd9
Split format_table_lines() & apply suggestions
AA-Turner Sep 17, 2025
af0394d
Merge branch 'main' into c-analyzer-embedded-tabs
AA-Turner Sep 17, 2025
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
Prev Previous commit
Next Next commit
Split format_table_lines() & apply suggestions
  • Loading branch information
@AA-Turner
AA-Turner committed Sep 17, 2025
commit f1cfdd96370c97336ff9518dc862ec8eead5aed3
83 changes: 44 additions & 39 deletions Tools/c-analyzer/cpython/_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ def _abs(relfile):
return os.path.join(REPO_ROOT, relfile)


def format_table_lines(lines):
def format_conf_lines(lines):
"""Format conf entries for use in a TSV table."""
return [_abs(entry) for entry in lines]


def format_tsv_lines(lines):
"""Format entries for use in a TSV table."""
lines = ((_abs(first), *rest) for first, *rest in lines)
lines = map('\t'.join, lines)
Expand All @@ -41,64 +46,64 @@ def format_table_lines(lines):
'''

# XXX Handle these.
EXCLUDED = format_table_lines([
# OSX
('Modules/_scproxy.c',), # SystemConfiguration/SystemConfiguration.h
EXCLUDED = format_conf_lines([
# macOS
'Modules/_scproxy.c', # SystemConfiguration/SystemConfiguration.h

# Windows
('Modules/_winapi.c',), # windows.h
('Modules/expat/winconfig.h',),
('Modules/overlapped.c',), # winsock.h
('Python/dynload_win.c',), # windows.h
('Python/thread_nt.h',),
'Modules/_winapi.c', # windows.h
'Modules/expat/winconfig.h',
'Modules/overlapped.c', # winsock.h
'Python/dynload_win.c', # windows.h
'Python/thread_nt.h',

# other OS-dependent
('Python/dynload_aix.c',), # sys/ldr.h
('Python/dynload_dl.c',), # dl.h
('Python/dynload_hpux.c',), # dl.h
('Python/emscripten_signal.c',),
('Python/emscripten_syscalls.c',),
('Python/thread_pthread.h',),
('Python/thread_pthread_stubs.h',),
'Python/dynload_aix.c', # sys/ldr.h
'Python/dynload_dl.c', # dl.h
'Python/dynload_hpux.c', # dl.h
'Python/emscripten_signal.c',
'Python/emscripten_syscalls.c',
'Python/thread_pthread.h',
'Python/thread_pthread_stubs.h',

# only huge constants (safe but parsing is slow)
('Modules/_ssl_data_*.h',),
('Modules/cjkcodecs/mappings_*.h',),
('Modules/unicodedata_db.h',),
('Modules/unicodename_db.h',),
('Objects/unicodetype_db.h',),
'Modules/_ssl_data_*.h',
'Modules/cjkcodecs/mappings_*.h',
'Modules/unicodedata_db.h',
'Modules/unicodename_db.h',
'Objects/unicodetype_db.h',

# generated
('Python/deepfreeze/*.c',),
('Python/frozen_modules/*.h',),
('Python/generated_cases.c.h',),
('Python/executor_cases.c.h',),
('Python/optimizer_cases.c.h',),
'Python/deepfreeze/*.c',
'Python/frozen_modules/*.h',
'Python/generated_cases.c.h',
'Python/executor_cases.c.h',
'Python/optimizer_cases.c.h',
# XXX: Throws errors if PY_VERSION_HEX is not mocked out
('Modules/clinic/_testclinic_depr.c.h',),
'Modules/clinic/_testclinic_depr.c.h',

# not actually source
('Python/bytecodes.c',),
('Python/optimizer_bytecodes.c',),
'Python/bytecodes.c',
'Python/optimizer_bytecodes.c',

# mimalloc
('Objects/mimalloc/*.c',),
('Include/internal/mimalloc/*.h',),
('Include/internal/mimalloc/mimalloc/*.h',),
'Objects/mimalloc/*.c',
'Include/internal/mimalloc/*.h',
'Include/internal/mimalloc/mimalloc/*.h',
])

# XXX Fix the parser.
EXCLUDED += format_table_lines([
EXCLUDED += format_conf_lines([
# The tool should be able to parse these...

# The problem with xmlparse.c is that something
# has gone wrong where # we handle "maybe inline actual"
# in Tools/c-analyzer/c_parser/parser/_global.py.
('Modules/expat/internal.h',),
('Modules/expat/xmlparse.c',),
'Modules/expat/internal.h',
'Modules/expat/xmlparse.c',
])

INCL_DIRS = format_table_lines([
INCL_DIRS = format_tsv_lines([
# (glob, dirname)

('*', '.'),
Expand Down Expand Up @@ -127,7 +132,7 @@ def format_table_lines(lines):

])

INCLUDES = format_table_lines([
INCLUDES = format_tsv_lines([
# (glob, include)

('**/*.h', 'Python.h'),
Expand Down Expand Up @@ -161,7 +166,7 @@ def format_table_lines(lines):
('Objects/stringlib/split.h', 'Objects/stringlib/fastsearch.h'),
])

MACROS = format_table_lines([
MACROS = format_tsv_lines([
# (glob, name, value)

('Include/internal/*.h', 'Py_BUILD_CORE', '1'),
Expand Down Expand Up @@ -271,7 +276,7 @@ def format_table_lines(lines):

# others
('Modules/_sre/sre_lib.h', 'LOCAL(type)', 'static inline type'),
('Modules/_sre/sre_lib.h', 'SRE(F)', 'sre_ucs2_'), ##F
('Modules/_sre/sre_lib.h', 'SRE(F)', 'sre_ucs2_##F'),
('Objects/stringlib/codecs.h', 'STRINGLIB_IS_UNICODE', '1'),
('Include/internal/pycore_crossinterp_data_registry.h', 'Py_CORE_CROSSINTERP_DATA_REGISTRY_H', '1'),
])
Expand Down