Generate extensions for protocolsMap.py #339
Merged
+15
−54
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
kimdv
commented
Nov 20, 2021
Comment on lines
-268
to
-277
| % for protocol, conformances in SYNTAX_BUILDABLE_EXPRESSIBLE_AS_CONFORMANCES.items(): | ||
| % if 'ExpressibleAsConditionElementList' in conformances: | ||
| extension ${protocol} { | ||
| public func createConditionElementList() -> ConditionElementList { | ||
| ConditionElementList([self]) | ||
| } | ||
| } | ||
|
|
||
| % end | ||
| % end |
There was a problem hiding this comment.
This one properly slipped through when added #334
This was referenced Nov 21, 2021
ahoppen
reviewed
Nov 22, 2021
| % for conformance in conformances: | ||
| % node = NODE_MAP.get(conformance) | ||
| % if node and node.children: | ||
| % param = filter(lambda x : x.type_name != "TokenSyntax", node.children)[0].swift_name |
There was a problem hiding this comment.
I don’t think this is correct. We want to the first child that doesn’t have a default value. Currently optional children also have a default value of nil and TokenSyntax children might not have a default value if they don’t have a default text (see https://github.com/apple/swift/blob/17f1cf92973d2c1b3d5fe6b70f4a33771a303e3a/utils/gyb_syntax_support/kinds.py#L58-L64)
I think a better implementation would be
non_defaulted_params = filter(lambda child : syntax_buildable_default_init_value(child, SYNTAX_TOKEN_MAP.get(child.syntax_kind)) == None, node.children)
assert len(non_defaulted_params) == 1, "ExpressibleAs conformances expects the conforming type to have an initializer with a single non-optional child"
param = non_defaulted_params[0].swift_nameThere was a problem hiding this comment.
Ah, I didn't see that.
Added. Tough changes the == None to == "" as we return an empty string.
kimdv
force-pushed
the
kimdv/generate-conformances-for-protocolmap
branch
from
2355440 to
8d74eda
Compare
|
@swift-ci Please test |
ahoppen
approved these changes
Nov 23, 2021
|
@swift-ci Please test |
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.
Generate extensions for protocolsMap.py.