Skip to content

GH-107603: Clinic: Pass specific attributes to print_block() #108581

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
merged 5 commits into from
Aug 28, 2023
Merged

GH-107603: Clinic: Pass specific attributes to print_block() #108581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef8011e
Clinic: Only pass ``includes`` to ``print_block()``
AA-Turner Aug 28, 2023
373f13e
limited_capi, too
AA-Turner Aug 28, 2023
91456c7
tighten header_includes
AA-Turner Aug 28, 2023
72b4999
tighten limited_capi
AA-Turner Aug 28, 2023
1512b9d
tests
AA-Turner Aug 28, 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
2 changes: 1 addition & 1 deletion Lib/test/test_clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ def _test(self, input, output):
writer = clinic.BlockPrinter(language)
c = _make_clinic()
for block in blocks:
writer.print_block(block, clinic=c)
writer.print_block(block, limited_capi=c.limited_capi, header_includes=c.includes)
output = writer.f.getvalue()
assert output == input, "output != input!\n\noutput " + repr(output) + "\n\n input " + repr(input)

Expand Down
28 changes: 17 additions & 11 deletions Tools/clinic/clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2172,8 +2172,9 @@ def print_block(
self,
block: Block,
*,
clinic: Clinic,
core_includes: bool = False,
limited_capi: bool,
header_includes: dict[str, str],
) -> None:
input = block.input
output = block.output
Expand Down Expand Up @@ -2203,7 +2204,7 @@ def print_block(

output = ''
if core_includes:
if not clinic.limited_capi:
if not limited_capi:
output += textwrap.dedent("""
#if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
# include "pycore_gc.h" // PyGC_Head
Expand All @@ -2212,12 +2213,10 @@ def print_block(

""")

if clinic is not None:
# Emit optional includes
for include, reason in sorted(clinic.includes.items()):
line = f'#include "{include}"'
line = line.ljust(35) + f'// {reason}\n'
output += line
# Emit optional "#include" directives for C headers
for include, reason in sorted(header_includes.items()):
line = f'#include "{include}"'.ljust(35) + f'// {reason}\n'
output += line

input = ''.join(block.input)
output += ''.join(block.output)
Expand Down Expand Up @@ -2531,7 +2530,9 @@ def parse(self, input: str) -> str:
self.parsers[dsl_name] = parsers[dsl_name](self)
parser = self.parsers[dsl_name]
parser.parse(block)
printer.print_block(block, clinic=self)
printer.print_block(block,
limited_capi=self.limited_capi,
header_includes=self.includes)

# these are destinations not buffers
for name, destination in self.destinations.items():
Expand All @@ -2546,7 +2547,9 @@ def parse(self, input: str) -> str:
block.input = "dump " + name + "\n"
warn("Destination buffer " + repr(name) + " not empty at end of file, emptying.")
printer.write("\n")
printer.print_block(block, clinic=self)
printer.print_block(block,
limited_capi=self.limited_capi,
header_includes=self.includes)
continue

if destination.type == 'file':
Expand All @@ -2571,7 +2574,10 @@ def parse(self, input: str) -> str:

block.input = 'preserve\n'
printer_2 = BlockPrinter(self.language)
printer_2.print_block(block, core_includes=True, clinic=self)
printer_2.print_block(block,
core_includes=True,
limited_capi=self.limited_capi,
header_includes=self.includes)
write_file(destination.filename, printer_2.f.getvalue())
continue

Expand Down