<regex>: Implement collating ranges
#5238
Open
+393
−30
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
muellerj2
commented
Jan 15, 2025
| @@ -2917,7 +2917,8 @@ void _Builder<_FwdIt, _Elem, _RxTraits>::_Add_range2(const _Elem _Arg0, const _E | |||
|
|
|||
| _Node->_Small->_Mark(_Ex0); | |||
| } | |||
| if (_Ex1 >= _Ex0) { | |||
|
|
|||
| if (_Flags & regex_constants::collate || _Ex1 >= _Ex0) { | |||
There was a problem hiding this comment.
The control flow is subtle around here but the function ends up doing the right thing: When the collate flag is set, the _Builder constructor sets the member variables such that _Get_tmax() and _Get_bmax() return 0. This means that the preceding loop is skipped and the inner if condition is false (even if _Ex1 < _Ex0, because _Ex1 - _Ex0 computes an unsigned integer). So in the end, the code just adds the bounds to _Node->_Ranges.
CaseyCarter
reviewed
Jan 15, 2025
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.
Resolves #5204. Follow-up to #5164 and #5209.
When compiled under
/MDor/MDd, the new test cases specific to collating ranges are skipped:/Zc:wchar_t-because the test will fail due to<locale>:std::collate<wchar_t>does not respect collation order when compiled with/MD(d) /Zc:wchar_t-#5236._ITERATOR_DEBUG_LEVELbecause the stack will be corrupted whenstd::collate<wchar_t>::do_transform()is called in the linked DLL.Drive-by changes:
_Parser::_Error()as[[noreturn]]._Matcher::_Skip()and_Matcher::_Do_class(),_STDqualify calls to some free functions and clean up the control flow that translates the current character and converts it to an unsigned value.