gh-106368: Argument clinic: Fix minor bug in `state_modulename_name` (#107387)

This commit is contained in:
Alex Waygood 2023-07-28 19:10:45 +01:00 committed by GitHub
parent 3a1d819ebc
commit ecc05e23a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions

View File

@ -84,6 +84,7 @@ class FakeClinic:
('parser_definition', d('block')),
('impl_definition', d('block')),
))
self.functions = []
def get_destination(self, name):
d = self.destinations.get(name)
@ -104,6 +105,9 @@ class FakeClinic:
_module_and_class = clinic.Clinic._module_and_class
def __repr__(self):
return "<FakeClinic object>"
class ClinicWholeFileTest(_ParserBase):
def setUp(self):
@ -672,6 +676,19 @@ class ClinicParserTest(_ParserBase):
""")
self.assertEqual("os_stat_fn", function.c_basename)
def test_cloning_nonexistent_function_correctly_fails(self):
stdout = self.parse_function_should_fail("""
cloned = fooooooooooooooooooooooo
This is trying to clone a nonexistent function!!
""")
expected_error = """\
cls=None, module=<FakeClinic object>, existing='fooooooooooooooooooooooo'
(cls or module).functions=[]
Error on line 0:
Couldn't find existing function 'fooooooooooooooooooooooo'!
"""
self.assertEqual(expected_error, stdout)
def test_return_converter(self):
function = self.parse_function("""
module os

View File

@ -4707,11 +4707,9 @@ class DSLParser:
if existing_function.name == function_name:
break
else:
existing_function = None
if not existing_function:
print("class", cls, "module", module, "existing", existing)
print("cls. functions", cls.functions)
fail("Couldn't find existing function " + repr(existing) + "!")
print(f"{cls=}, {module=}, {existing=}")
print(f"{(cls or module).functions=}")
fail(f"Couldn't find existing function {existing!r}!")
fields = [x.strip() for x in full_name.split('.')]
function_name = fields.pop()