gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 08:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

If we are doing a numeric search, use the superclass method (with ICU numeric collation).

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39662 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2016-04-13 12:45:03 +00:00
parent 73a3bc2eb4
commit d53b94baba
1 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Source/GSString.m
View file

@ -3854,6 +3854,10 @@ transmute(GSStr self, NSString *aString)
options: (NSUInteger)mask options: (NSUInteger)mask
range: (NSRange)aRange range: (NSRange)aRange
{ {
if (mask & NSNumericSearch)
{
return [super compare: aString options: mask range: aRange];
}
GS_RANGE_CHECK(aRange, _count); GS_RANGE_CHECK(aRange, _count);
if (aString == nil) if (aString == nil)
[NSException raise: NSInvalidArgumentException [NSException raise: NSInvalidArgumentException
@ -4229,6 +4233,10 @@ agree, create a new GSCInlineString otherwise.
options: (NSUInteger)mask options: (NSUInteger)mask
range: (NSRange)aRange range: (NSRange)aRange
{ {
if (mask & NSNumericSearch)
{
return [super compare: aString options: mask range: aRange];
}
GS_RANGE_CHECK(aRange, _count); GS_RANGE_CHECK(aRange, _count);
if (aString == nil) if (aString == nil)
[NSException raise: NSInvalidArgumentException [NSException raise: NSInvalidArgumentException
@ -4439,28 +4447,6 @@ agree, create a new GSCInlineString otherwise.
return rangeOfCharacter_u((GSStr)self, aSet, mask, aRange); return rangeOfCharacter_u((GSStr)self, aSet, mask, aRange);
} }
/*
- (NSRange) rangeOfString: (NSString*)aString
options: (NSUInteger)mask
range: (NSRange)aRange
{
GS_RANGE_CHECK(aRange, _count);
if (aString == nil)
[NSException raise: NSInvalidArgumentException
format: @"[%@ -%@] nil string argument",
NSStringFromClass([self class]), NSStringFromSelector(_cmd)];
if (GSObjCIsInstance(aString) == NO)
[NSException raise: NSInvalidArgumentException
format: @"[%@ -%@] not a string argument",
NSStringFromClass([self class]), NSStringFromSelector(_cmd)];
if ((mask & NSRegularExpressionSearch) == NSRegularExpressionSearch)
{
return [super rangeOfString: aString options: mask range: aRange];
}
return rangeOfString_u((GSStr)self, aString, mask, aRange);
}
*/
- (NSStringEncoding) smallestEncoding - (NSStringEncoding) smallestEncoding
{ {
return NSUnicodeStringEncoding; return NSUnicodeStringEncoding;
@ -4702,6 +4688,10 @@ agree, create a new GSUInlineString otherwise.
options: (NSUInteger)mask options: (NSUInteger)mask
range: (NSRange)aRange range: (NSRange)aRange
{ {
if (mask & NSNumericSearch)
{
return [super compare: aString options: mask range: aRange];
}
GS_RANGE_CHECK(aRange, _count); GS_RANGE_CHECK(aRange, _count);
if (aString == nil) if (aString == nil)
[NSException raise: NSInvalidArgumentException [NSException raise: NSInvalidArgumentException