Merge nominal parsing into the one function #968
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
DougGregor
approved these changes
Oct 17, 2022
Heh, I actually did this because I noticed that |
|
@swift-ci please test |
ahoppen
approved these changes
Oct 18, 2022
bnbarham
force-pushed
the
unify-nominals
branch
from
b928b76 to
dcdc4c2
Compare
bnbarham
commented
Oct 19, 2022
| @@ -804,7 +804,7 @@ final class DeclarationTests: XCTestCase { | |||
|
|
|||
| func testDontRecoverFromDeclKeyword() { | |||
| AssertParse( | |||
| "func foo(first second 1️⃣third 3️⃣struct4️⃣: Int) {}", | |||
| "func foo(first second 1️⃣third 2️⃣struct3️⃣: Int4️⃣) {}", | |||
There was a problem hiding this comment.
This was previously parsing just struct with all unexpected, but now (after also checking for start of line) parses the remained as a struct instead.
bnbarham
commented
Oct 19, 2022
| ) -> T where T: NominalTypeDeclarationTrait { | ||
| let (unexpectedBeforeIntroducerKeyword, introducerKeyword) = self.eat(introucerHandle) | ||
| let (unexpectedBeforeName, name) = self.expectIdentifier(keywordRecovery: true) | ||
| if unexpectedBeforeName == nil && name.isMissing && self.currentToken.isAtStartOfLine { |
There was a problem hiding this comment.
And to be clear - self.currentToken.isAtStartOfLine is the change here.
|
@swift-ci please test |
ahoppen
approved these changes
Oct 20, 2022
bnbarham
force-pushed
the
unify-nominals
branch
2 times, most recently
from
4f4583e to
0030cac
Compare
|
@swift-ci please test |
bnbarham
commented
Oct 21, 2022
Comment on lines
+185
to
+186
| DiagnosticSpec(locationMarker: "3️⃣", message: "expected identifier in protocol"), | ||
| DiagnosticSpec(locationMarker: "4️⃣", message: "unexpected code '>(x: T)' in protocol"), |
There was a problem hiding this comment.
I figure this is no worse. But... also isn't great.
bnbarham
commented
Oct 21, 2022
All nominals had extremely similar parse functions. Merge them into the one function so that improvements to one improves them all.
bnbarham
force-pushed
the
unify-nominals
branch
from
0030cac to
301047b
Compare
|
@swift-ci please 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.
All nominals had extremely similar parse functions. Merge them into the one function so that improvements to one improves them all.