join: extra check for empty string + empty sep #576
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
this could cause \r and \n to be kept as two graphemes when they were joined with an empty string in between and the empty string as the separator.
samcv
requested changes
Apr 9, 2017
src/strings/ops.c
Outdated
| @@ -1220,9 +1220,18 @@ MVMString * MVM_string_join(MVMThreadContext *tc, MVMString *separator, MVMObjec | |||
|
|
|||
| /* Add separator if needed. */ | |||
| if (i > 0) { | |||
| /* If there's no separator and one piece is The Empty String we | |||
| * have to be extra careful about concat stability */ | |||
| if (sgraphs == 0 && MVM_string_graphs(tc, piece) == 0) { | |||
There was a problem hiding this comment.
You can use MVM_string_graphs_nocheck here since MVM_string_graphs is already run on each piece in the loop above.
src/strings/ops.c
Outdated
| * have to be extra careful about concat stability */ | ||
| if (sgraphs == 0 && MVM_string_graphs(tc, piece) == 0) { | ||
| if (!concats_stable) | ||
| ; |
There was a problem hiding this comment.
What is this empty block for? I think it would be more clear if the if statement on L1225 checked concat_stable and the else if loop below become just a plain if loop
samcv
approved these changes
Apr 9, 2017
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.
this could cause \r and \n to be kept as two graphemes
when they were joined with an empty string in between and
the empty string as the separator.