X Tutup
The Wayback Machine - https://web.archive.org/web/20221223142959/https://github.com/python/cpython/pull/23929/files
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.

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

bpo-36876: [c-analyzer tool] Additional CLI updates for "capi" command. #23929

Merged
merged 9 commits into from Dec 25, 2020
+380 −93
Merged

bpo-36876: [c-analyzer tool] Additional CLI updates for "capi" command. #23929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
528c2bc
Fix "c-analyzer.py capi --kinds" handling.
ericsnowcurrently Dec 24, 2020
33d0547
Clean up incomplete line parsing.
ericsnowcurrently Dec 24, 2020
f1e3f78
Improve sorting.
ericsnowcurrently Dec 24, 2020
112dcae
format: brief -> table
ericsnowcurrently Dec 24, 2020
b11e21b
Fix --no-track-progress.
ericsnowcurrently Dec 24, 2020
a76e87b
Add --no-show-empty to CLI.
ericsnowcurrently Dec 24, 2020
ea9845c
Filter out "ignored" names.
ericsnowcurrently Dec 24, 2020
900b41e
Force the default groupby.
ericsnowcurrently Dec 24, 2020
4c22e90
Add a basic script to demo the usefulness of the "capi" subcommand.
ericsnowcurrently Dec 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 Tools/c-analyzer/cpython/__main__.py
View file
Open in desktop
@@ -241,15 +241,15 @@ def process_kinds(args, *, argv=None):
for raw in args.kinds or ():
for kind in raw.replace(',', ' ').strip().split():
if kind in _capi.KINDS:
kind.append(kind)
kinds.append(kind)
else:
parser.error(f'expected KIND to be one of {sorted(_capi.KINDS)}, got {kind!r}')
args.kinds = set(kinds)

parser.add_argument('--group-by', dest='groupby',
choices=['level', 'kind'])

parser.add_argument('--format', default='brief')
parser.add_argument('--format', default='table')
parser.add_argument('--summary', dest='format',
action='store_const', const='summary')
def process_format(args, *, argv=None):
@@ -259,12 +259,27 @@ def process_format(args, *, argv=None):
if args.format not in _capi._FORMATS:
parser.error(f'unsupported format {orig!r}')

parser.add_argument('--show-empty', dest='showempty', action='store_true')
parser.add_argument('--no-show-empty', dest='showempty', action='store_false')
parser.set_defaults(showempty=None)

# XXX Add --sort-by, --sort and --no-sort.

parser.add_argument('--ignore', dest='ignored', action='append')
def process_ignored(args, *, argv=None):
ignored = []
for raw in args.ignored or ():
ignored.extend(raw.replace(',', ' ').strip().split())
args.ignored = ignored or None

parser.add_argument('filenames', nargs='*', metavar='FILENAME')
process_progress = add_progress_cli(parser)

return [
process_levels,
process_kinds,
process_format,
process_ignored,
process_progress,
]

@@ -273,7 +288,9 @@ def cmd_capi(filenames=None, *,
levels=None,
kinds=None,
groupby='kind',
format='brief',
format='table',
showempty=None,
ignored=None,
track_progress=None,
verbosity=VERBOSITY,
**kwargs
@@ -282,15 +299,24 @@ def cmd_capi(filenames=None, *,

filenames = _files.iter_header_files(filenames, levels=levels)
#filenames = (file for file, _ in main_for_filenames(filenames))
if track_progress is not None:
if track_progress:
filenames = track_progress(filenames)
items = _capi.iter_capi(filenames)
if levels:
items = (item for item in items if item.level in levels)
if kinds:
items = (item for item in items if item.kind in kinds)

lines = render(items, groupby=groupby, verbose=verbosity > VERBOSITY)
filter = _capi.resolve_filter(ignored)
if filter:
items = (item for item in items if filter(item, log=lambda msg: logger.log(1, msg)))

lines = render(
items,
groupby=groupby,
showempty=showempty,
verbose=verbosity > VERBOSITY,
)
print()
for line in lines:
print(line)
X Tutup