[Macros] [SE-0382] Implement macros defined as expansions of other macros #64641
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
DougGregor
requested review from
hborla,
slavapestov,
xedin,
zoecarver and
CodaFi
as code owners
|
@swift-ci please smoke test |
|
@swift-ci please smoke test |
DougGregor
force-pushed
the
macro-replacement-expansion
branch
from
289f05a to
ea0398d
Compare
|
@swift-ci please smoke test |
DougGregor
changed the title
DougGregor
changed the title
|
@swift-ci please smoke test |
bnbarham
reviewed
Mar 29, 2023
| @@ -2,6 +2,9 @@ | |||
| // | |||
| // REQUIRES: nonexecutable_test | |||
| // REQUIRES: swift_swift_parser | |||
| // FIXME: Swift parser is not enabled on Linux CI yet. | |||
| // REQUIRES: OS=macosx | |||
There was a problem hiding this comment.
I assume you ran into whatever I ran into in #64089 that caused me not to merge it, though I don't remember what it was 😅
In preparation for supporting macros that are defined in terms of other macros, adopt macro definition checking provided by the `MacroDeclSyntax.checkDefinition` operation (implemented in swift-syntax). Use this in lieu of the checking on the C++ side. This required me to finally fix an issue with the source ranges for Fix-Its, where we were replacing the leading/trailing trivia of nodes along with the node itself, even though that's incorrect: we should only replce the node itself, and there are other Fix-It kinds for replacing leading or trailing trivia.
We were enabling the `$Macros` feature unconditionally, even when the compiler itself doesn't support macros (because it's missing swift-syntax). Change this to only enable the feature when the compiler supports it.
Handle a trivial macro defined in terms of another macro.
This enables macros to be defined in terms of other macros.
These expressions are a little tricky, because we don't always type-check them in the way that clients would expect. We might want to change the representation here, but until then... don't walk the untypechecked ones.
This should complete the implementation of expanded macro definitions, rdar://104044325.
DougGregor
force-pushed
the
macro-replacement-expansion
branch
from
58fe207 to
68b367b
Compare
|
@swift-ci please smoke 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.
Implement support for defining a macro in terms of the expansion of another macro, e.g.,
There are a few steps along the way:
MacroDeclSyntax.checkDefinitionoperation (implemented in swift-syntax) in lieu of the checking we currently do on the C++ side$Macrosfor compilers that can actually expand macros, and make sure we only run tests that require macro checking for compiler that support expansion.This aspect of macros is tracked by rdar://104044325