Skip to content

bpo-40178: Convert the remaining os functions to Argument Clinic. #19360

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
serhiy-storchaka merged 6 commits into from
Apr 18, 2020
Merged

bpo-40178: Convert the remaining os functions to Argument Clinic. #19360

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a8c436e
bpo-40178: Convert the remaining os funtions to Argument Clinic.
serhiy-storchaka Oct 5, 2019
3d38f84
Fix merging error.
serhiy-storchaka Apr 4, 2020
bdeab5d
Fix compilation on masOS and *BSD.
serhiy-storchaka Apr 4, 2020
089ba93
bpo-40179: Fix translation of #elif in Argument Clinic
serhiy-storchaka Apr 4, 2020
8f64fb9
Merge branch 'clinic-endif' into os-sendfile-clinic
serhiy-storchaka Apr 4, 2020
35045da
Merge branch 'master' into os-sendfile-clinic
serhiy-storchaka Apr 18, 2020
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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Tools-Demos/2020-04-04-19-35-22.bpo-40179.u9FH10.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed translation of ``#elif`` in Argument Clinic.
14 changes: 7 additions & 7 deletions Modules/clinic/posixmodule.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 16 additions & 21 deletions Tools/clinic/cpp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,23 +141,15 @@ def pop_stack():
token = fields[0].lower()
condition = ' '.join(fields[1:]).strip()

if_tokens = {'if', 'ifdef', 'ifndef'}
all_tokens = if_tokens | {'elif', 'else', 'endif'}

if token not in all_tokens:
return

# cheat a little here, to reuse the implementation of if
if token == 'elif':
pop_stack()
token = 'if'

if token in if_tokens:
if token in {'if', 'ifdef', 'ifndef', 'elif'}:
if not condition:
self.fail("Invalid format for #" + token + " line: no argument!")
if token == 'if':
if token in {'if', 'elif'}:
if not self.is_a_simple_defined(condition):
condition = "(" + condition + ")"
if token == 'elif':
previous_token, previous_condition = pop_stack()
self.stack.append((previous_token, negate(previous_condition)))
else:
fields = condition.split()
if len(fields) != 1:
Expand All @@ -166,18 +158,21 @@ def pop_stack():
condition = 'defined(' + symbol + ')'
if token == 'ifndef':
condition = '!' + condition
token = 'if'

self.stack.append(("if", condition))
if self.verbose:
print(self.status())
return
self.stack.append((token, condition))

previous_token, previous_condition = pop_stack()
elif token == 'else':
previous_token, previous_condition = pop_stack()
self.stack.append((previous_token, negate(previous_condition)))

if token == 'else':
self.stack.append(('else', negate(previous_condition)))
elif token == 'endif':
pass
while pop_stack()[0] != 'if':
pass

else:
return

if self.verbose:
print(self.status())

Expand Down