Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Fix and optimise overload compatibility checking#14018

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
hauntsaninja merged 2 commits intopython:masterfromhauntsaninja:overload-compat
Nov 6, 2022
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
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
PrevPrevious commit
and simplify
  • Loading branch information
@hauntsaninja
hauntsaninja committedNov 6, 2022
commitd0c3d20787031a15d7d1b20a263e0adc37b865c9
55 changes: 23 additions & 32 deletionsmypy/subtypes.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -823,9 +823,8 @@ def visit_overloaded(self, left: Overloaded) -> bool:
# Ensure each overload in the right side (the supertype) is accounted for.
previous_match_left_index = -1
matched_overloads = set()
possible_invalid_overloads = set()

forright_index,right_item inenumerate(right.items):
for right_item in right.items:
found_match = False

for left_index, left_item in enumerate(left.items):
Expand All@@ -834,44 +833,36 @@ def visit_overloaded(self, left: Overloaded) -> bool:
# Order matters: we need to make sure that the index of
# this item is at least the index of the previous one.
if subtype_match and previous_match_left_index <= left_index:
if not found_match:
# Update the index of the previous match.
previous_match_left_index = left_index
found_match = True
matched_overloads.add(left_item)
possible_invalid_overloads.discard(left_item)
break
previous_match_left_index = left_index
found_match = True
matched_overloads.add(left_index)
break
Copy link
CollaboratorAuthor

@hauntsaninjahauntsaninjaNov 6, 2022•
edited
Loading

Choose a reason for hiding this comment

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

adding the break here is the main functional change, everything in the second commit preserves behaviour

else:
# If this one overlaps with the supertype in any way, but it wasn't
# an exact match, then it's a potential error.
strict_concat = self.options.strict_concatenate if self.options else True
if is_callable_compatible(
left_item,
right_item,
is_compat=self._is_subtype,
ignore_return=True,
ignore_pos_arg_names=self.subtype_context.ignore_pos_arg_names,
strict_concatenate=strict_concat,
) or is_callable_compatible(
right_item,
left_item,
is_compat=self._is_subtype,
ignore_return=True,
ignore_pos_arg_names=self.subtype_context.ignore_pos_arg_names,
strict_concatenate=strict_concat,
if left_index not in matched_overloads and (
is_callable_compatible(
left_item,
right_item,
is_compat=self._is_subtype,
ignore_return=True,
ignore_pos_arg_names=self.subtype_context.ignore_pos_arg_names,
strict_concatenate=strict_concat,
)
or is_callable_compatible(
right_item,
left_item,
is_compat=self._is_subtype,
ignore_return=True,
ignore_pos_arg_names=self.subtype_context.ignore_pos_arg_names,
strict_concatenate=strict_concat,
)
):
# If this is an overload that's already been matched, there's no
# problem.
if left_item not in matched_overloads:
possible_invalid_overloads.add(left_item)
return False

if not found_match:
return False

if possible_invalid_overloads:
# There were potentially invalid overloads that were never matched to the
# supertype.
return False
return True
elif isinstance(right, UnboundType):
return True
Expand Down
22 changes: 22 additions & 0 deletionstest-data/unit/check-classes.test
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3886,6 +3886,14 @@ class Sub2(Super):
def foo(self, a: A) -> A: pass
@overload
def foo(self, a: C) -> C: pass

class Sub3(Super):
@overload
def foo(self, a: A) -> int: pass
@overload
def foo(self, a: A) -> A: pass
@overload
def foo(self, a: C) -> C: pass
[builtins fixtures/classmethod.pyi]
[out]
tmp/foo.pyi:19: error: Overloaded function signature 2 will never be matched: signature 1's parameter type(s) are the same or broader
Expand All@@ -3903,6 +3911,20 @@ tmp/foo.pyi:24: note: def foo(self, a: A) -> A
tmp/foo.pyi:24: note: @overload
tmp/foo.pyi:24: note: def foo(self, a: C) -> C
tmp/foo.pyi:25: error: Overloaded function signatures 1 and 2 overlap with incompatible return types
tmp/foo.pyi:32: error: Signature of "foo" incompatible with supertype "Super"
tmp/foo.pyi:32: note: Superclass:
tmp/foo.pyi:32: note: @overload
tmp/foo.pyi:32: note: def foo(self, a: A) -> A
tmp/foo.pyi:32: note: @overload
tmp/foo.pyi:32: note: def foo(self, a: C) -> C
tmp/foo.pyi:32: note: Subclass:
tmp/foo.pyi:32: note: @overload
tmp/foo.pyi:32: note: def foo(self, a: A) -> int
tmp/foo.pyi:32: note: @overload
tmp/foo.pyi:32: note: def foo(self, a: A) -> A
tmp/foo.pyi:32: note: @overload
tmp/foo.pyi:32: note: def foo(self, a: C) -> C
tmp/foo.pyi:35: error: Overloaded function signature 2 will never be matched: signature 1's parameter type(s) are the same or broader

[case testTypeTypeOverlapsWithObjectAndType]
from foo import *
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp