Skip to content

gh-112205: Support @setter annotation from AC #112922

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
corona10 merged 18 commits into from
Dec 13, 2023
Merged

gh-112205: Support @setter annotation from AC #112922

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
488a127
gh-112205: Support `@setter` annotation from AC
corona10 Dec 10, 2023
384d6c1
Update
corona10 Dec 10, 2023
2a8c3de
Apply suggestions from code review
corona10 Dec 10, 2023
0ffa78b
Address code review
corona10 Dec 10, 2023
8e85ab3
nit
corona10 Dec 10, 2023
f3517f9
Prohibit declaration of return type for `getset`
corona10 Dec 10, 2023
323cfc0
Add test
corona10 Dec 10, 2023
30da0cf
Update Tools/clinic/clinic.py
corona10 Dec 11, 2023
1539d11
Address code review
corona10 Dec 11, 2023
d18cd49
Address code review
corona10 Dec 11, 2023
bc373f6
Apply suggestions from code review
corona10 Dec 13, 2023
0cd047b
Use pattern matching
corona10 Dec 13, 2023
c8a035f
Address code review
corona10 Dec 13, 2023
9c66961
fix test
corona10 Dec 13, 2023
06b1cb1
Add test
corona10 Dec 13, 2023
2510a35
Address code review
corona10 Dec 13, 2023
53777df
Update Lib/test/test_clinic.py
corona10 Dec 13, 2023
61f7215
Fix
corona10 Dec 13, 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
Apply suggestions from code review 
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
  • Loading branch information
@corona10 @erlend-aasland
corona10 and erlend-aasland authored Dec 10, 2023
commit 2a8c3de295a67157b80fe27d659399175553b9ba
7 changes: 4 additions & 3 deletions Tools/clinic/clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@ def parser_body(

parsearg: str | None
if f.kind in {GETTER, SETTER} and len(parameters) > 0:
Comment thread
corona10 marked this conversation as resolved.
Outdated
raise RuntimeError("@getter, @setter should not define paramters")
fail("neither @getter nor @setter can define parameters")
Comment thread
AlexWaygood marked this conversation as resolved.
Outdated

if not parameters:
parser_code: list[str] | None
Expand Down Expand Up @@ -1978,7 +1978,7 @@ def render_function(
template_dict['c_basename'] = f.c_basename + "_get"
elif f.kind is SETTER:
template_dict['c_basename'] = f.c_basename + "_set"
# TODO: Improve handling pararms better way.
# Implicitly add the setter value parameter.
data.impl_parameters.append("PyObject *value")
Comment thread
corona10 marked this conversation as resolved.
data.impl_arguments.append("value")
else:
Expand All @@ -1994,6 +1994,7 @@ def render_function(

f.return_converter.render(f, data)
if f.kind is SETTER:
# All setters return an int.
template_dict['impl_return_type'] = 'int'
Comment thread
corona10 marked this conversation as resolved.
else:
template_dict['impl_return_type'] = f.return_converter.type
Expand Down Expand Up @@ -5375,7 +5376,7 @@ def at_critical_section(self, *args: str) -> None:

def at_getter(self) -> None:
if self.kind in (GETTER, SETTER):
fail("@getter and @setter can not be declared at once")
fail("only one of @getter or @setter can be used")
self.kind = GETTER

def at_setter(self) -> None:
Expand Down