gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-20 20:26:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some optimisation.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@26783 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2008-07-15 06:57:01 +00:00
parent 8beea23511
commit c2b6a65594
6 changed files with 96 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Source/NSString.m
View file

@ -4967,28 +4967,38 @@ static NSFileManager *fm = nil;
{
NSRange range;
unsigned int count = 0;
GSRSFunc func;
if (replace == nil)
if ([replace isKindOfClass: NSStringClass] == NO)
{
[NSException raise: NSInvalidArgumentException
format: @"%@ nil search string", NSStringFromSelector(_cmd)];
format: @"%@ bad search string", NSStringFromSelector(_cmd)];
}
if (by == nil)
if ([by isKindOfClass: NSStringClass] == NO)
{
[NSException raise: NSInvalidArgumentException
format: @"%@ nil replace string", NSStringFromSelector(_cmd)];
format: @"%@ bad replace string", NSStringFromSelector(_cmd)];
}
range = [self rangeOfString: replace options: opts range: searchRange];
if (NSMaxRange(searchRange) > [self length])
{
[NSException raise: NSInvalidArgumentException
format: @"%@ bad search range", NSStringFromSelector(_cmd)];
}
func = GSPrivateRangeOfString(self, replace);
range = (*func)(self, replace, opts, searchRange);
if (range.length > 0)
{
unsigned byLen = [by length];
SEL sel;
void (*imp)(id, SEL, NSRange, NSString*);
sel = @selector(replaceCharactersInRange:withString:);
imp = (void(*)(id, SEL, NSRange, NSString*))[self methodForSelector: sel];
do
{
count++;
[self replaceCharactersInRange: range
withString: by];
(*imp)(self, sel, range, by);
if ((opts & NSBackwardsSearch) == NSBackwardsSearch)
{
searchRange.length = range.location - searchRange.location;
@ -5002,9 +5012,7 @@ static NSFileManager *fm = nil;
searchRange.length = newEnd - searchRange.location;
}
range = [self rangeOfString: replace
options: opts
range: searchRange];
range = (*func)(self, replace, opts, searchRange);
}
while (range.length > 0);
}