Author: rfm
Date: Tue May 26 14:19:02 2015
New Revision: 38556
URL: http://svn.gna.org/viewcvs/gnustep?rev=38556&view=rev
Log:
remove a little unused code
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=38556&r1=38555&r2=38556&view=diff
==============================================================================
--- libs/base/trunk/Source/GSString.m (original)
+++ libs/base/trunk/Source/GSString.m Tue May 26 14:19:02 2015
@@ -3533,38 +3533,6 @@
}
}
-static inline NSRange
-rangeOfString_c(GSStr self, NSString *aString, unsigned mask, NSRange aRange)
-{
- Class c;
-
- c = object_getClass(aString);
- if (GSObjCIsKindOf(c, GSUnicodeStringClass) == YES
- || (c == GSMutableStringClass && ((GSStr)aString)->_flags.wide == 1))
- return strRangeCsUs((id)self, aString, mask, aRange);
- else if (GSObjCIsKindOf(c, GSCStringClass) == YES
- || (c == GSMutableStringClass && ((GSStr)aString)->_flags.wide == 0))
- return strRangeCsCs((id)self, aString, mask, aRange);
- else
- return strRangeCsNs((id)self, aString, mask, aRange);
-}
-
-static inline NSRange
-rangeOfString_u(GSStr self, NSString *aString, unsigned mask, NSRange aRange)
-{
- Class c;
-
- c = object_getClass(aString);
- if (GSObjCIsKindOf(c, GSUnicodeStringClass) == YES
- || (c == GSMutableStringClass && ((GSStr)aString)->_flags.wide == 1))
- return strRangeUsUs((id)self, aString, mask, aRange);
- else if (GSObjCIsKindOf(c, GSCStringClass) == YES
- || (c == GSMutableStringClass && ((GSStr)aString)->_flags.wide == 0))
- return strRangeUsCs((id)self, aString, mask, aRange);
- else
- return strRangeUsNs((id)self, aString, mask, aRange);
-}
-
static inline NSString*
substring_c(GSStr self, NSRange aRange)
{
@@ -4105,28 +4073,6 @@
return rangeOfCharacter_c((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_c((GSStr)self, aString, mask, aRange);
-}
-*/
-
- (NSStringEncoding) smallestEncoding
{
return internalEncoding;
@@ -5392,31 +5338,6 @@
return rangeOfCharacter_c((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];
- }
- if (_flags.wide == 1)
- return rangeOfString_u((GSStr)self, aString, mask, aRange);
- else
- return rangeOfString_c((GSStr)self, aString, mask, aRange);
-}
-*/
-
- (void) replaceCharactersInRange: (NSRange)aRange
withString: (NSString*)aString
{
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
