Author: rfm
Date: Wed Apr 13 14:45:03 2016
New Revision: 39662
URL: http://svn.gna.org/viewcvs/gnustep?rev=39662&view=rev
Log:
If we are doing a numeric search, use the superclass method (with ICU numeric
collation).
Modified:
libs/base/trunk/Source/GSString.m
Modified: libs/base/trunk/Source/GSString.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/GSString.m?rev=39662&r1=39661&r2=39662&view=diff
==============================================================================
--- libs/base/trunk/Source/GSString.m (original)
+++ libs/base/trunk/Source/GSString.m Wed Apr 13 14:45:03 2016
@@ -3854,6 +3854,10 @@
options: (NSUInteger)mask
range: (NSRange)aRange
{
+ if (mask & NSNumericSearch)
+ {
+ return [super compare: aString options: mask range: aRange];
+ }
GS_RANGE_CHECK(aRange, _count);
if (aString == nil)
[NSException raise: NSInvalidArgumentException
@@ -4229,6 +4233,10 @@
options: (NSUInteger)mask
range: (NSRange)aRange
{
+ if (mask & NSNumericSearch)
+ {
+ return [super compare: aString options: mask range: aRange];
+ }
GS_RANGE_CHECK(aRange, _count);
if (aString == nil)
[NSException raise: NSInvalidArgumentException
@@ -4439,28 +4447,6 @@
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
{
return NSUnicodeStringEncoding;
@@ -4702,6 +4688,10 @@
options: (NSUInteger)mask
range: (NSRange)aRange
{
+ if (mask & NSNumericSearch)
+ {
+ return [super compare: aString options: mask range: aRange];
+ }
GS_RANGE_CHECK(aRange, _count);
if (aString == nil)
[NSException raise: NSInvalidArgumentException
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
