[Macros/Parse] Attributes on MacroExpansionDecl #65815
Conversation
|
swiftlang/swift-syntax#1650 |
|
swiftlang/swift-syntax#1650 |
test/Parse/line-directive.swift
Outdated
There was a problem hiding this comment.
This is improved because previously # not followed by an identifier was true for isStartOfSwiftDecl(). Now it's false so the expression parsing recovery skips the second #.
rintaro
force-pushed
the
macros-attributes-rdar107386648
branch
from
9b92a14 to
9017dea
Compare
|
swiftlang/swift-syntax#1650 |
lib/Sema/TypeCheckMacros.cpp
Outdated
There was a problem hiding this comment.
This will cause problems when the same attribute is added to multiple places. Per our offline discussion, I think it's best for us to syntactically add the attributes (e.g., by splicing them into the DeclSyntax nodes we get back from the macro) rather than do it semantically. That way, we'll see the attributes in the expansion.
There was a problem hiding this comment.
I scoped down this PR to Parse support only. Removed this bit.
lib/Sema/TypeCheckMacros.cpp
Outdated
There was a problem hiding this comment.
The actual fix for this will be in TypeRefinementContextBuilder.
test/Parse/line-directive.swift
Outdated
rintaro
force-pushed
the
macros-attributes-rdar107386648
branch
from
9017dea to
74ddec5
Compare
* Parse `#<identifier>` attribute list as a `MacroExpansionDecl` regardless of the position * Diagnose whitespaces between `#` and the macro name. * Correctly attach attributes to `MacroExpansionDecl` * Fix `OrigDeclAttributes` to handle modifiers (use `getLocation()` instead of `AtLoc`.) Type checking is a TODO rdar://107386648
rintaro
force-pushed
the
macros-attributes-rdar107386648
branch
from
74ddec5 to
9fc1521
Compare
rintaro
changed the title
|
swiftlang/swift-syntax#1650 |
rintaro
requested review from
CodaFi,
ahoppen,
bnbarham,
hborla,
slavapestov and
xedin
as code owners
|
swiftlang/swift-syntax#1650 |
1 similar comment
|
swiftlang/swift-syntax#1650 |
| consumeToken(); | ||
| } while (isStartOfSwiftDecl(/*allowPoundIfAttributes=*/false)); | ||
| } while (isStartOfSwiftDecl(/*allowPoundIfAttributes=*/false, | ||
| /*hadAttrsOrModifiers=*/true)); |
There was a problem hiding this comment.
actor is still declared as a (deprecated) modifier, and it's diagnosed as a error in parseDeclModifierList(). The diagnostic message is not great, though.
There was a problem hiding this comment.
Ah, OK. Makes sense then. Just wanted to double-check
| consumeToken(tok::identifier); | ||
| return isStartOfSwiftDecl(/*allowPoundIfAttributes=*/false); | ||
| return isStartOfSwiftDecl(/*allowPoundIfAttributes=*/false, | ||
| /*hadAttrsOrModifiers=*/true); |
There was a problem hiding this comment.
What’s the attribute or modifier that has been consumed here?
There was a problem hiding this comment.
At this point Tok is a contextual keyword, and all decl introducers with contextual keyword (e.g. macro) are handled above. The all remaining cases are simple decl modifiers.
There was a problem hiding this comment.
At this point
Tokis a contextual keyword
We don’t know that it’s a contextual keyword, right? We just continue pretending that it might be, but really, it could be any identifier, right? Or am I missing something?
There was a problem hiding this comment.
There's
// If this can't possibly be a contextual keyword, then this identifier is
// not interesting. Bail out.
if (!Tok.isContextualDeclKeyword())
return false;
above.
There was a problem hiding this comment.
Ah, OK. I just didn’t read far enough back. It’s what you get from large functions that implicitly retain state from other early exits…
Thanks for the explanation. Good with me 👍🏽
| if (!isStartOfFreestandingMacroExpansion()) { | ||
| consumeToken(tok::pound); | ||
| diagnose(Tok.getLoc(), | ||
| diag::macro_expansion_expr_expected_macro_identifier); | ||
| return makeParserError(); | ||
| } |
There was a problem hiding this comment.
Weren’t we diagnosing this before? Out of curiosity: Is there a test case that triggers this?
3 participants
#<identifier>after an attribute list as aMacroExpansionDeclregardless of the position#and the macro nameMacroExpansionDeclOrigDeclAttributesto handle modifiers (usegetLocation()instead ofAtLoc.)Type checking and macro expansion are TODO
rdar://107386648