[Parse] Improve freestanding macro expansion parsing #65967
Conversation
rintaro
requested review from
ahoppen,
bnbarham,
CodaFi,
DougGregor,
hborla,
slavapestov and
xedin
as code owners
|
@swift-ci Please smoke test |
rintaro
changed the title
include/swift/Parse/Parser.h
Outdated
| @@ -1731,6 +1731,9 @@ class Parser { | |||
| /// cases this doesn't actually make sense but we need to accept them for | |||
| /// backwards compatibility. | |||
| AllowLowercaseAndUppercaseSelf = 1 << 6, | |||
|
|
|||
| /// Parse keyword as identifier but emit fix-it to escape it. | |||
| AllowKeywordWithBacktickEscape = AllowKeywords | 1 << 7 | |||
include/swift/Parse/Parser.h
Outdated
| @@ -1731,6 +1731,9 @@ class Parser { | |||
| /// cases this doesn't actually make sense but we need to accept them for | |||
| /// backwards compatibility. | |||
| AllowLowercaseAndUppercaseSelf = 1 << 6, | |||
|
|
|||
| /// Parse keyword as identifier but emit fix-it to escape it. | |||
| AllowKeywordWithBacktickEscape = AllowKeywords | 1 << 7 | |||
lib/Parse/ParseExpr.cpp
Outdated
| auto closuresStatus = parseTrailingClosures( | ||
| /*isExprBasic*/ false, macroNameLoc.getSourceRange(), trailingClosures); |
There was a problem hiding this comment.
Reading this, I now realize that we aren’t emitting a warning for trailing closure inside an if condition. If it’s easy to fix that in this PR, I think that would be good, otherwise I can file an issue for it.
@freestanding(expression)
macro myMacro(x: () -> Void) -> Bool
func myFunc(x: () -> Void) -> Bool { true }
func test() {
if myFunc {} {} // warning: trailing closure in this context is confusable with the body of the statement; pass as a parenthesized argument to silence this warning
if #myMacro {} {} // no warning
}There was a problem hiding this comment.
I think I just forgot to pass isExprBasic here? But that's wasn't the case before this PR. I will check.
There was a problem hiding this comment.
We need to update checkStmtConditionTrailingClosure() in Sema, but it turned out that the current type checked MacroExpansionExpr doesn't have coerced ArgumentList. That is required for getting closure argument label for fix-it. Let's just file an issue for now.
There was a problem hiding this comment.
OK, thanks. It’s “only” a warning as well, so it doesn’t break source.
* Unify macro expansion parsing logic between MacroExpansionExpr and MacroExpansionDecl * Diagnose whitespace between '#' and the macro name * Diagnose keyword as a macro name
rintaro
force-pushed
the
macroexpanson-name-sameline
branch
from
3a4811e to
e3a0f24
Compare
|
@swift-ci Please smoke test |
MacroExpansionExprandMacroExpansionDecl(introduceparseFreestandingMacroExpansion)