* Source/NSString.m: Add primitive implementation for

rangeOfComposedCharacterSequencesForRange:.
This commit is contained in:
fredkiefer 2018-07-07 16:51:18 +02:00
parent 5a72e1cfa8
commit 19c00c43c0
2 changed files with 21 additions and 5 deletions

View file

@ -1,3 +1,8 @@
2018-07-07 Fred Kiefer <fredkiefer@gmx.de>
* Source/NSString.m: Add primitive implementation for
rangeOfComposedCharacterSequencesForRange:.
2018-07-06 Fred Kiefer <fredkiefer@gmx.de>
* Source/GSString.m: Remove GSString copyWithZone:.

View file

@ -2263,11 +2263,6 @@ GSICUCollatorOpen(NSStringCompareOptions mask, NSLocale *locale)
return range;
}
- (NSRange) rangeOfComposedCharacterSequencesForRange: (NSRange)range
{
return NSMakeRange(0, 0); // FIXME
}
/**
* Invokes -rangeOfString:options: with no options.
*/
@ -2840,6 +2835,22 @@ GSICUCollatorOpen(NSStringCompareOptions mask, NSLocale *locale)
return NSMakeRange(start, end-start);
}
- (NSRange) rangeOfComposedCharacterSequencesForRange: (NSRange)range
{
NSRange startRange = [self rangeOfComposedCharacterSequenceAtIndex: range.location];
if (NSMaxRange(startRange) >= NSMaxRange(range))
{
return startRange;
}
else
{
NSRange endRange = [self rangeOfComposedCharacterSequenceAtIndex: NSMaxRange(range) - 1];
return NSUnionRange(startRange, endRange);
}
}
// Identifying and Comparing Strings
/**