X Tutup
Skip to content

gh-95065: Argument Clinic: Pretty-print long C strings in generated code #107712

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
erlend-aasland merged 8 commits into from
Aug 7, 2023
Merged

gh-95065: Argument Clinic: Pretty-print long C strings in generated code #107712

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3479b2f
gh-95065: Argument Clinic: Pretty-print long C strings in generated code
erlend-aasland Aug 7, 2023
9dbb61a
Perhaps better
erlend-aasland Aug 7, 2023
3e24974
Escapes are only needed for preprocessor code
erlend-aasland Aug 7, 2023
68c1b1e
width iso. literal
erlend-aasland Aug 7, 2023
3de2378
Compact version
erlend-aasland Aug 7, 2023
b4cebfd
Slightly nicer
erlend-aasland Aug 7, 2023
4fc27a9
Slightly nicer
erlend-aasland Aug 7, 2023
0c8bbf1
Even more compact code
erlend-aasland Aug 7, 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
Prev Previous commit
Next Next commit
Compact version
  • Loading branch information
@erlend-aasland
erlend-aasland committed Aug 7, 2023
commit 3de23788462dabdaa56af65d159f525fa6586df7
39 changes: 10 additions & 29 deletions Tools/clinic/clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,39 +222,20 @@ def c_repr(s: str) -> str:


def wrapped_c_string_literal(
line: str,
text: str,
*,
width: int = 72,
indent: int = 0,
suffix: str = '',
initial_indent: int = 0,
subsequent_indent: int = 4
Comment on lines +227 to +230
Copy link
Member

@AlexWaygood AlexWaygood Aug 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems all call sites specify a value for the subsequent_indent parameter. Maybe it should be required, instead of optional?

Suggested change
width: int = 72,
suffix: str = '',
initial_indent: int = 0,
subsequent_indent: int = 4
subsequent_indent: int,
width: int = 72,
suffix: str = '',
initial_indent: int = 0,

Copy link
Contributor Author

@erlend-aasland erlend-aasland Aug 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, perhaps.

) -> str:
add, out = text_accumulator()
words = line.split(' ')
first = True
while True:
if first:
add(' ' * indent)
first = False
else:
add(' ' * subsequent_indent)
add('"')
sz = indent + 1
while True:
try:
word = words[0]
except IndexError:
add('"')
return out()
sz += len(word) + 1
if sz > width:
break
add(word)
del words[0]
if words:
add(' ')
add('"')
add(suffix)
add('\n')
wrapped = textwrap.wrap(text, replace_whitespace=False,
drop_whitespace=False, break_on_hyphens=False)
suffix = f"{suffix}\n"
lines = [f'"{line}"{suffix}' for line in wrapped]
separator = subsequent_indent * ' '
joined = initial_indent * ' ' + separator.join(lines)
return joined.removesuffix(suffix)


is_legal_c_identifier = re.compile('^[A-Za-z_][A-Za-z0-9_]*$').match
Expand Down
X Tutup