Skip to content

Fixed testRecovery157 #1512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Apr 13, 2023
Merged

Fixed testRecovery157 #1512

merged 1 commit into from
Apr 13, 2023

Conversation

CippoX
Copy link
Contributor

@CippoX CippoX commented Apr 10, 2023

Fixing testRecovery157
#1373

@CippoX
Copy link
Contributor Author

CippoX commented Apr 10, 2023 •
edited
Loading

@ahoppen Let me know if I'm on the right track, should I check if after .atSign there's actually .rawStringDelimiter, .stringQuote etc.?

case (.atSign, _)?:
       return RawExprSyntax(self.parseStringLiteral())

kimdv
kimdv requested changes Apr 10, 2023
View reviewed changes
@CippoX CippoX requested a review from kimdv April 10, 2023 08:54
ahoppen
ahoppen approved these changes Apr 11, 2023
View reviewed changes
Copy link
Member

@ahoppen ahoppen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. If all tests parse, I think this is ready to merge as-is. Just mark it as ready for review 😉

@CippoX CippoX force-pushed the objective-c-literals branch from dd3a135 to 560bfb7 Compare April 12, 2023 10:00
@CippoX CippoX marked this pull request as ready for review April 12, 2023 10:01
@CippoX CippoX changed the title Fixing testRecovery157 Fixed testRecovery157 Apr 12, 2023
@kimdv
Copy link
Contributor

kimdv commented Apr 12, 2023

@swift-ci please test

@CippoX CippoX force-pushed the objective-c-literals branch from 40ad758 to 0ed41dc Compare April 12, 2023 16:22
@CippoX
Copy link
Contributor Author

CippoX commented Apr 12, 2023

This should fix the problem

CippoX
CippoX commented Apr 12, 2023
View reviewed changes
Sources/SwiftParser/Expressions.swift
@@ -32,6 +32,8 @@ extension TokenConsumer {
} else {
return true
}
case (.primaryExpressionStart(.atSign), let handle)?:
break
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added this lines

ahoppen
ahoppen approved these changes Apr 12, 2023
View reviewed changes
Copy link
Member

@ahoppen ahoppen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you. Let’s merge it 👍🏽

@ahoppen
Copy link
Member

ahoppen commented Apr 12, 2023

@swift-ci Please test

@ahoppen ahoppen enabled auto-merge April 12, 2023 19:57
@ahoppen
Copy link
Member

ahoppen commented Apr 12, 2023

@swift-ci Please test Windows

@ahoppen ahoppen merged commit 2d5575b into swiftlang:main Apr 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahoppen ahoppen ahoppen approved these changes

@kimdv kimdv kimdv approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@CippoX @kimdv @ahoppen