Introduce if/switch expressions #63022
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
hamishknight
requested review from
CodaFi,
DougGregor,
ahoppen,
bnbarham,
hborla,
rintaro,
slavapestov,
xedin and
zoecarver
as code owners
This was referenced Jan 13, 2023
hamishknight
commented
Jan 13, 2023
hamishknight
force-pushed
the
express-yourself
branch
2 times, most recently
from
d6d48a9 to
68301f7
Compare
Contributor
|
I'll try to take a look at this today! |
xedin
reviewed
Jan 14, 2023
hamishknight
force-pushed
the
express-yourself
branch
from
68301f7 to
96da632
Compare
Contributor
Author
|
Diff of changes modulo the rebase: https://github.com/apple/swift/compare/a6b33578a22e10de7ce272a60a1120f757f43f53..96da632832166b6d39b7f6b14f68560b50956210 |
hamishknight
force-pushed
the
express-yourself
branch
from
96da632 to
a58fd23
Compare
xedin
approved these changes
Jan 27, 2023
Contributor
xedin
left a comment
xedin
left a comment
There was a problem hiding this comment.
LGTM! Left a couple of minor comments that shouldn't block landing of this PR.
lib/Sema/CSSyntacticElement.cpp
Outdated
Contributor
There was a problem hiding this comment.
Hm, I think we have a bug here unrelated to your changes - if function/accessor/closure has been result builder transformed it would no longer be single-expression so we need to expand the check.
Contributor
Author
There was a problem hiding this comment.
Heh, good catch! I can file a bug if you want
Contributor
There was a problem hiding this comment.
Let's do that so it doesn't get lost. I'll open a PR to fix that once your changes land.
hamishknight
force-pushed
the
express-yourself
branch
from
a58fd23 to
504a21e
Compare
hamishknight
force-pushed
the
express-yourself
branch
6 times, most recently
from
e73e890 to
7bbc84d
Compare
hamishknight
force-pushed
the
express-yourself
branch
2 times, most recently
from
d4939e0 to
6f95b65
Compare
hamishknight
force-pushed
the
express-yourself
branch
from
6f95b65 to
509346d
Compare
For a single expression closure, just use the expression as the body in the case where we're coercing to Void, as the return is already implied. This avoids crashing in `ClosureExpr::getSingleExpressionBody` with a double braced body. Surprisingly it seems nothing is currently calling `ClosureExpr::getSingleExpressionBody` after type-checking, so no test case, but later commits in this patch will exercise this case.
Split out brace element handling for a couple of walkers into a new function. The diff for this is best viewed without whitespace changes. This should be NFC.
Factor out some type-checking logic for ReturnStmt, including the conversion to FailStmt, into a request. We can then invoke this request from both the regular type-checking path, as well as during a pre-check of an expression.
Introduce SingleValueStmtExpr, which allows the embedding of a statement in an expression context. This then allows us to parse and type-check `if` and `switch` statements as expressions, gated behind the `IfSwitchExpression` experimental feature for now. In the future, SingleValueStmtExpr could also be used for e.g `do` expressions. For now, only single expression branches are supported for producing a value from an `if`/`switch` expression, and each branch is type-checked independently. A multi-statement branch may only appear if it ends with a `throw`, and it may not `break`, `continue`, or `return`. The placement of `if`/`switch` expressions is also currently limited by a syntactic use diagnostic. Currently they're only allowed in bindings, assignments, throws, and returns. But this could be lifted in the future if desired.
Look through `try`/`await` markers when looking for out of place if/switch expressions, and customize the effect checking diagnostic such that we error that `try`/`await` are redundant on `if`/`switch` expressions.
hamishknight
force-pushed
the
express-yourself
branch
from
509346d to
0d55f45
Compare
This was referenced Feb 2, 2023
Contributor
Author
Contributor
Author
Contributor
Author
Contributor
Author
|
🚢 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Introduce SingleValueStmtExpr, which allows the embedding of a statement in an expression context. This then allows us to parse and type-check
ifandswitchstatements as expressions. In the future, SingleValueStmtExpr could also be used for e.gdoexpressions.For now, only single expression branches are supported for producing a value from an
if/switchexpression, and each branch is type-checked independently. A multi-statement branch may only appear if it ends with athrow, and it may notbreak,continue, orreturn.The placement of
if/switchexpressions is also currently limited by a syntactic use diagnostic. Currently they're only allowed in bindings, assignments, throws, and returns. But this could be lifted in the future if desired.