Skip to content
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.

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

[Syntax] Support "conflict marker" and "carriage return" trivia #13500

Merged
merged 5 commits into from
Dec 19, 2017

Conversation

rintaro
Copy link
Member

@rintaro rintaro commented Dec 18, 2017

  • To distinguish \r from \n, added CarriageReturn trivia.
  • Support lexing VCS conflict markers as GarbargeText trivia.

@rintaro
Copy link
Member Author

rintaro commented Dec 18, 2017

This PR conflicts with #13495. I will update this PR when it's merged.

@rintaro rintaro changed the title [Syntax] Support "conflict marker" and "carriage return" trivia [Do Not Merge][Syntax] Support "conflict marker" and "carriage return" trivia Dec 18, 2017
@rintaro
Copy link
Member Author

rintaro commented Dec 19, 2017

@swift-ci Please smoke test

@rintaro rintaro changed the title [Do Not Merge][Syntax] Support "conflict marker" and "carriage return" trivia [Syntax] Support "conflict marker" and "carriage return" trivia Dec 19, 2017
@rintaro rintaro merged commit 6a20133 into apple:master Dec 19, 2017
@rintaro rintaro deleted the syntax-trivia-misc branch December 19, 2017 02:39
@CodaFi CodaFi mentioned this pull request Dec 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant