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

Favour p to q in ||| parser if consuming same #chars #166

Merged
merged 1 commit into from
Apr 10, 2019

Conversation

Philippus
Copy link
Member

@Philippus Philippus commented Aug 15, 2018

fixes #72

@SethTisue

This comment has been minimized.

@Philippus

This comment has been minimized.

@SethTisue

This comment has been minimized.

@SethTisue
Copy link
Member

@Philippus https://contributors.scala-lang.org/t/reviewers-wanted-for-scala-parser-combinators-prs/2041 didn't produce any reviewers. shall we just merge this, do you think?

@Philippus
Copy link
Member Author

The behaviour of the |||-parser changes so maybe this should also target a 1.2.x branch?

@SethTisue
Copy link
Member

maybe this should also target a 1.2.x branch?

one could argue it either way, I think, but targeting a 1.2.x branch does seem like the safe/conservative choice

I've opened #188 to have a broader discussion about maybe branching

@Philippus Philippus added this to the 1.2.0 milestone Feb 17, 2019
@Philippus Philippus changed the base branch from 1.1.x to 1.2.x April 7, 2019 10:36
@Philippus
Copy link
Member Author

rebased onto the 1.2.x branch

@Philippus Philippus merged commit 61c1493 into scala:1.2.x Apr 10, 2019
@Philippus Philippus deleted the issue-72 branch April 10, 2019 19:46
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.

||| should resolve a tie by choosing this parser rather than q
2 participants