Deduplicate implementation of ;; detection
#386
Merged
Conversation
This file contains 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
Leonidas-from-XIV
added
the
no changelog
Julow
reviewed
Jul 26, 2022
lib/block.ml
Outdated
| @@ -219,7 +219,7 @@ let ends_by_semi_semi c = | |||
| match List.rev c with | |||
| | h :: _ -> | |||
| let len = String.length h in | |||
| len > 2 && h.[len - 1] = ';' && h.[len - 2] = ';' | |||
| len > 2 && Astring.String.is_suffix ~affix:";;" h | |||
There was a problem hiding this comment.
Why len > 2 rather than len >= 2 ? (the latter is implicitly checked by is_suffix)
There was a problem hiding this comment.
I assumed that it also checks that there is something in there besides just the ;; but this might have been a typo in the original code. Maybe it really was just a guard for the string subindexing. Removing the check altogether makes the tests all pass so I've amended the code to remove the check.
This was necessary for the indexing operation but Astring can take care of it itself.
Julow
approved these changes
Jul 27, 2022
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.
While pondering a solution for #368 I realized that the code is full of duplicated definitions of
ends_by_semi_semi, so I just decided to make it consistent.Mdx.Blockmight not be the best place to put it, but I gather it is still better than having it copied in 3 places. Interestingly, it was all the same implementation.4.13 can use
String.ends_withbut that's a pretty high limit so I decided to use the implementation fromAstringto make it a bit more readable, which we depend on already.