New way of directly building FunctionType::Params from ParameterLists #18651
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
This converts a list of ParameterDecls into a list of AnyFunctionType::Params; it will eventually replace these methods on ParameterList: - getType() (both overloads) - getInterfaceType() - getFullInterfaceType()
This is mostly NFC; the output of the api-digester test changed because the interface type of an enum element now has parentheses around the 'Self' parameter type. This is more consistent with everything else (and in the future, all function types will have "parentheses").
…erList::getParams() Note that these functions used to return a FunctionType; now, they return the result type instead: - importFunctionType() - importMethodType() - importAccessorMethodType() The parameters were already being returned in the form of a ParameterList of ParamDecls. This actually has the effect of making the code simpler, because callers would always take them apart and build new function types anyway.
It looks like as of 42246ca the importer deals exclusively with interface types, and recent refactoring eliminated the requirement to store contextual types into VarDecls and ParamDecls, so we can remove this last little bit of mapping here.
|
@swift-ci Please test |
|
@swift-ci Please test source compatibility |
|
Nice! |
Can you change the docs, then? I see that they still provide the ParameterList as an out-parameter, so the names don't have to change, but it's not obvious from the call sites that you're getting a result type, and it should be written down in prose somewhere. |
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.
Recent changes centralized the code for computing the type of functions, subscripts, and enum elements. This removed a lot of duplication but there was still a hack there because to go from a ParameterList to a FunctionType, we had to turn the ParameterList into a TupleType, and then decompose the TupleType into an array of FunctionType::Params. That's silly, so let's make a way to build FunctionType::Params directly and remove all of the old code.