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.

Sign up for GitHub

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

Fix broken enumerateSubstringsInRange:options:usingBlock: implementation #416

Merged
merged 2 commits into from
Jun 11, 2024
Merged

Fix broken enumerateSubstringsInRange:options:usingBlock: implementation #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c69d09
NSString: Fix broken enumerateSubstringsInRange:options:usingBlock: i…
hmelder Jun 4, 2024
edbc859
NSString: Add enumerateSubstringsInRange tests
hmelder Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 28 additions & 40 deletions Source/NSString.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6371,7 +6371,7 @@ - (void) enumerateSubstringsInRange: (NSRange)range
else if (substringType == NSStringEnumerationByWords
|| substringType == NSStringEnumerationBySentences)
{
#if GS_USE_ICU
#if GS_USE_ICU
// These macros may be useful elsewhere.
#define GS_U_HANDLE_ERROR(errorCode, description) do { \
if (U_FAILURE(errorCode)) { \
Expand All @@ -6389,6 +6389,7 @@ - (void) enumerateSubstringsInRange: (NSRange)range
UErrorCode errorCode = U_ZERO_ERROR;
const char *locale;
UBreakIterator *breakIterator;
int32_t start, end;

[self getCharacters: characters range: range];
/* @ss=standard will use lists of common abbreviations,
Expand All @@ -6405,55 +6406,42 @@ - (void) enumerateSubstringsInRange: (NSRange)range
length, // textLength
&errorCode);
GS_U_HANDLE_ERROR(errorCode, @"opening ICU break iterator");
ubrk_first(breakIterator);
while (YES)
{
// Make sure it's a valid substring.
BOOL isValidSubstring = YES;
int32_t nextPosition;
NSUInteger nextLocation;
NSRange enclosingRange;

if (byWords)
{
int32_t ruleStatus = ubrk_getRuleStatus(breakIterator);
/* From ICU User Guide:
* A status value UBRK_WORD_NONE indicates that the boundary
* does not start a word or number.
* However, valid words seem to be UBRK_WORD_NONE, and invalid
* words seem to be UBRK_WORD_NONE_LIMIT.
*/
isValidSubstring = ruleStatus != UBRK_WORD_NONE_LIMIT;
// NSLog(@"Status for position %d (%d): %d", (int)currentLocation, (int)ubrk_current(breakIterator), (int) ruleStatus);
}

nextPosition = ubrk_next(breakIterator);
if (nextPosition == UBRK_DONE) break;

nextLocation = range.location + nextPosition;
// Same as substringRange
enclosingRange
= NSMakeRange(currentLocation, nextLocation - currentLocation);
// FIXME: Implement reverse enumeration by using ubrk_last and ubrk_previous
start = ubrk_first(breakIterator);
for (end = ubrk_next(breakIterator); end != UBRK_DONE; start = end, end = ubrk_next(breakIterator))
{
BOOL isValidSubstring = YES;
NSUInteger nextLocation;
NSRange enclosingRange;

if (isValidSubstring)
{
if (byWords)
{
int32_t ruleStatus;

ruleStatus = ubrk_getRuleStatus(breakIterator);
isValidSubstring = ruleStatus != UBRK_WORD_NONE;
}

nextLocation = range.location + end;
enclosingRange = NSMakeRange(currentLocation, end - start);
currentLocation = nextLocation;

if (isValidSubstring)
{
CALL_BLOCK(block,
substringNotRequired
? nil
: [self substringWithRange: enclosingRange],
substringNotRequired ? nil : [self substringWithRange: enclosingRange],
enclosingRange,
enclosingRange,
&stop);
if (stop) break;
}

currentLocation = nextLocation;
}
#else
}
}
#else
NSWarnLog(@"NSStringEnumerationByWords and NSStringEnumerationBySentences"
@" are not supported when GNUstep-base is compiled without ICU.");
return;
#endif
#endif
}
else if (substringType == NSStringEnumerationByCaretPositions)
{
Expand Down
Loading
Loading