Parse attributes in #if
#1276
Merged
Parse attributes in #if
#1276
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
|
@swift-ci Please test |
bnbarham
reviewed
Jan 26, 2023
Sources/SwiftParser/Lookahead.swift
Outdated
| @@ -207,42 +207,35 @@ extension Parser.Lookahead { | |||
| return true | |||
| } | |||
|
|
|||
| /// Tries consuming a `#if` directive that only contains attributes. | |||
| /// Returns `true` if that was successful and `false` if | |||
| /// - we are not at a valid `#if` directive (e.g. `#elseif` is missing) | |||
There was a problem hiding this comment.
Suggested change
| /// - we are not at a valid `#if` directive (e.g. `#elseif` is missing) | |
| /// - we are not at a valid `#if` directive (e.g. `#endif` is missing) |
rintaro
reviewed
Jan 26, 2023
Sources/SwiftParser/Lookahead.swift
Outdated
| var didSeeAnyAttributes = false | ||
| var poundIfLoopProgress = LoopProgressCondition() | ||
| repeat { | ||
| self.consume(ifAny: [.poundIfKeyword, .poundElseKeyword, .poundEndifKeyword]) |
There was a problem hiding this comment.
You meant poundElseifKeyword?
Suggested change
| self.consume(ifAny: [.poundIfKeyword, .poundElseKeyword, .poundEndifKeyword]) | |
| assert(self.at(any: [.poundIfKeyword, .poundElseifKeyword, .poundElseKeyword])) | |
| consumeAnyToken() |
| @@ -120,6 +120,13 @@ extension TokenConsumer { | |||
| return false | |||
| } | |||
| } | |||
|
|
|||
| mutating func atStartOfIfConfigOfAttributes() -> Bool { | |||
Fixes swiftlang#1119 rdar://103048943
ahoppen
force-pushed
the
ahoppen/attribute-if-config
branch
from
b3a2458 to
0381f9c
Compare
|
@swift-ci Please test |
rintaro
approved these changes
Jan 27, 2023
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.
Fixes #1119
rdar://103048943