Skip to content

gh-64660: Don't hardcode Argument Clinic return converter result variable name #104200

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 7 commits into from
May 7, 2023
Merged

gh-64660: Don't hardcode Argument Clinic return converter result variable name #104200

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
acfdab7
gh-64660: Don't hard-code '_return_value' in AC return converters
erlend-aasland May 4, 2023
de9dc35
gh-64660: Don't hardcode Argument Clinic return converter result vari…
erlend-aasland May 5, 2023
0fd153e
Pull in main
erlend-aasland May 5, 2023
884f03e
Pull in main
erlend-aasland May 5, 2023
cf3f060
Pull in main
erlend-aasland May 7, 2023
548732e
Naming
erlend-aasland May 7, 2023
fc2939f
Remove XXX comment
erlend-aasland May 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
gh-64660: Don't hardcode Argument Clinic return converter result vari… 
…able name
  • Loading branch information
@erlend-aasland
erlend-aasland committed May 5, 2023
commit de9dc35aa3557ee602727ae45c862723c7ec1ed4
20 changes: 11 additions & 9 deletions Tools/clinic/clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@ def __init__(self):
# value from the parse function. This is also where
# you should check the _return_value for errors, and
# "goto exit" if there are any.
self._return_value = "_return_value"
self.return_conversion = []

# The C statements required to do some operations
Expand Down Expand Up @@ -3876,7 +3877,6 @@ class CReturnConverter(metaclass=CReturnConverterAutoRegister):
# The Python default value for this parameter, as a Python value.
# Or the magic value "unspecified" if there is no default.
default = None
retvar = "_return_value"

def __init__(self, *, py_default=None, **kwargs):
self.py_default = py_default
Expand All @@ -3895,9 +3895,11 @@ def declare(self, data):
add(self.type)
if not self.type.endswith('*'):
add(' ')
add(self.retvar + ';')
add(data._return_value + ';')
data.declarations.append(''.join(line))
data.return_value = self.retvar
# XXX Removing this hack breaks current generated code.
# We should aim to get rid of this workaround.
data.return_value = data._return_value

def err_occurred_if(self, expr, data):
data.return_conversion.append('if (({}) && PyErr_Occurred()) {{\n goto exit;\n}}\n'.format(expr))
Expand All @@ -3919,9 +3921,9 @@ class bool_return_converter(CReturnConverter):

def render(self, function, data):
self.declare(data)
self.err_occurred_if(f"{self.retvar} == -1", data)
self.err_occurred_if(f"{data._return_value} == -1", data)
data.return_conversion.append(
f'return_value = PyBool_FromLong((long){self.retvar});\n'
f'return_value = PyBool_FromLong((long){data._return_value});\n'
)

class long_return_converter(CReturnConverter):
Expand All @@ -3932,9 +3934,9 @@ class long_return_converter(CReturnConverter):

def render(self, function, data):
self.declare(data)
self.err_occurred_if(f"{self.retvar} == {self.unsigned_cast}-1", data)
self.err_occurred_if(f"{data._return_value} == {self.unsigned_cast}-1", data)
data.return_conversion.append(
f'return_value = {self.conversion_fn}({self.cast}{self.retvar});\n'
f'return_value = {self.conversion_fn}({self.cast}{data._return_value});\n'
)

class int_return_converter(long_return_converter):
Expand Down Expand Up @@ -3977,9 +3979,9 @@ class double_return_converter(CReturnConverter):

def render(self, function, data):
self.declare(data)
self.err_occurred_if(f"{self.retvar} == -1.0", data)
self.err_occurred_if(f"{data._return_value} == -1.0", data)
data.return_conversion.append(
f'return_value = PyFloat_FromDouble({self.cast}{self.retvar});\n'
f'return_value = PyFloat_FromDouble({self.cast}{data._return_value});\n'
)

class float_return_converter(double_return_converter):
Expand Down