Handle prefix/suffix in typevartuple *args support #14112
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JukkaL
approved these changes
Nov 16, 2022
mypy/checkexpr.py
Outdated
|
|
||
| if len(callee_arg_types) != len(actual_types): | ||
| # TODO: Improve error message | ||
| self.chk.fail("Incorrect number of args passed", context) |
There was a problem hiding this comment.
Can you update this to "Invalid number of arguments", for a little more consistent messages. It could also be good to include the name of the function being called, but that can be tweaked later.
mypy/applytype.py
Outdated
|
|
||
| unpacked_type = get_proper_type(var_arg.typ.type) | ||
| if isinstance(unpacked_type, TupleType): | ||
| # Assuming for now that because we convert prefices to positional arguments, |
mypy/checkexpr.py
Outdated
| continue | ||
|
|
||
| assert len(callee_arg_types) == len(actual_types) | ||
| assert len(callee_arg_types) == len(actual_kinds) |
There was a problem hiding this comment.
This assert seems redundant, since we check that len(actual_types) == len(actual_kinds) above.
mypy/constraints.py
Outdated
| elif isinstance(unpacked_type, TupleType): | ||
| # Prefixes get converted to positional args, so technically the only case we | ||
| # should have here is like Tuple[Unpack[Ts], Y1, Y2, Y3]. If this turns out | ||
| # not to hold we can always handle the prefices too. |
jhance
force-pushed
the
concrete-tuple
branch
from
07bbafb to
ab3e562
Compare
This comment has been minimized.
This comment has been minimized.
This requires handling more cases in the various places that we previously modified to support *args in general. We also need to refresh the formals-to-actuals twice in checkexpr as now it can happen in the infer_function_type_arguments_using_context call. The handling here is kind of asymmetric, because we can convert prefices into positional arguments, but there is no equivalent for suffices, so we represent that as a Tuple[Unpack[...], <suffix>] and handle that case separately in some spots. We also support various edge cases like passing in a tuple without any typevartuples involved.
jhance
force-pushed
the
concrete-tuple
branch
from
ab3e562 to
505e0d4
Compare
This comment has been minimized.
This comment has been minimized.
|
According to mypy_primer, this change has no effect on the checked open source code. 🤖🎉 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This requires handling more cases in the various places that we previously modified to support *args in general. We also need to refresh the formals-to-actuals twice in checkexpr as now it can happen in the infer_function_type_arguments_using_context call.
The handling here is kind of asymmetric, because we can convert prefices into positional arguments, but there is no equivalent for suffices, so we represent that as a Tuple[Unpack[...], ] and handle that case separately in some spots.
We also support various edge cases like passing in a tuple without any typevartuples involved.