CodePoint versions of oneOf and noneOf #127
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
fsoikin
commented
Jan 5, 2022
| @@ -121,6 +125,14 @@ oneOf ss = satisfy (flip elem ss) <?> ("one of " <> show ss) | |||
| noneOf :: forall m. Monad m => Array Char -> ParserT String m Char | |||
| noneOf ss = satisfy (flip notElem ss) <?> ("none of " <> show ss) | |||
|
|
|||
| -- | Match one of the Unicode characters in the array. | |||
| oneOfCodePoints :: forall m. Monad m => Array CodePoint -> ParserT String m CodePoint | |||
| oneOfCodePoints ss = satisfyCodePoint (flip elem ss) <|> defer \_ -> fail $ "Expected one of " <> show (singleton <$> ss) | |||
There was a problem hiding this comment.
I chose to make error messages deferred to avoid the cost of generating the error messages until they're needed. Feels like a small thing, but the waste just bothers me too much.
Let me know if this is undesirable for some reason, I'll change it back to <?>
There was a problem hiding this comment.
Thanks, I think this is a great idea, and from the tests you added it clearly works. We should probably do this everywhere. I opened #128
|
Thanks for the PR @fsoikin ! Checking... |
Closed
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.
Description of the change
anyCharprimitive was modified such that it no longer always succeeds, but succeeds only on BMP characters, and a newanyCodePointwas added with the former semantics ofanyChar. A corresponding version ofsatisfy, -satisfyCodePoint, - was added as well.CodePointversions ofoneOfandnoneOf-oneOfCodePointsandnoneOfCodePointsrespectively.Checklist:
Linked any existing issues or proposals that this pull request should closeUpdated or added relevant documentation in the README and/or documentation directory