mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-26 18:21:04 +00:00
- Using the correct format specifier - Remove substringFromRange: (GNUstep extension) from NSString.h and use the non-deprecated version in -base. - Delete definitions of methods that are the same in both a class and a category on that class (NSArray and NSObject). Two files still have warnings: - The GNUTLS stuff is using a load of deprecated APIs. - xmlparse.m replaces a method using a category. This method seems to always return nil. Not sure what it's meant to do, or why it isn't a delegate of some kind. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@33756 72102866-910b-0410-8b05-ffd578937521
152 lines
4 KiB
Objective-C
152 lines
4 KiB
Objective-C
/* Implementation of extension methods to base additions
|
|
|
|
Copyright (C) 2010 Free Software Foundation, Inc.
|
|
|
|
Written by: Richard Frith-Macdonald <rfm@gnu.org>
|
|
|
|
This file is part of the GNUstep Base Library.
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
Boston, MA 02111 USA.
|
|
|
|
*/
|
|
#import "common.h"
|
|
#import "Foundation/NSException.h"
|
|
#import "GNUstepBase/NSArray+GNUstepBase.h"
|
|
#import "GSPrivate.h"
|
|
|
|
@implementation NSArray (GNUstepBase)
|
|
|
|
- (NSUInteger) insertionPosition: (id)item
|
|
usingFunction: (NSComparisonResult (*)(id, id, void *))sorter
|
|
context: (void *)context
|
|
{
|
|
NSUInteger count = [self count];
|
|
NSUInteger upper = count;
|
|
NSUInteger lower = 0;
|
|
NSUInteger index;
|
|
SEL oaiSel;
|
|
IMP oai;
|
|
|
|
if (item == nil)
|
|
{
|
|
[NSException raise: NSGenericException
|
|
format: @"Attempt to find position for nil object in array"];
|
|
}
|
|
if (sorter == 0)
|
|
{
|
|
[NSException raise: NSGenericException
|
|
format: @"Attempt to find position with null comparator"];
|
|
}
|
|
|
|
oaiSel = @selector(objectAtIndex:);
|
|
oai = [self methodForSelector: oaiSel];
|
|
/*
|
|
* Binary search for an item equal to the one to be inserted.
|
|
*/
|
|
for (index = upper/2; upper != lower; index = lower+(upper-lower)/2)
|
|
{
|
|
NSComparisonResult comparison;
|
|
|
|
comparison = (*sorter)(item, (*oai)(self, oaiSel, index), context);
|
|
if (comparison == NSOrderedAscending)
|
|
{
|
|
upper = index;
|
|
}
|
|
else if (comparison == NSOrderedDescending)
|
|
{
|
|
lower = index + 1;
|
|
}
|
|
else
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
/*
|
|
* Now skip past any equal items so the insertion point is AFTER any
|
|
* items that are equal to the new one.
|
|
*/
|
|
while (index < count && (*sorter)(item, (*oai)(self, oaiSel, index), context)
|
|
!= NSOrderedAscending)
|
|
{
|
|
index++;
|
|
}
|
|
return index;
|
|
}
|
|
|
|
- (NSUInteger) insertionPosition: (id)item
|
|
usingSelector: (SEL)comp
|
|
{
|
|
NSUInteger count = [self count];
|
|
NSUInteger upper = count;
|
|
NSUInteger lower = 0;
|
|
NSUInteger index;
|
|
NSComparisonResult (*imp)(id, SEL, id);
|
|
SEL oaiSel;
|
|
IMP oai;
|
|
|
|
if (item == nil)
|
|
{
|
|
[NSException raise: NSGenericException
|
|
format: @"Attempt to find position for nil object in array"];
|
|
}
|
|
if (comp == 0)
|
|
{
|
|
[NSException raise: NSGenericException
|
|
format: @"Attempt to find position with null comparator"];
|
|
}
|
|
imp = (NSComparisonResult (*)(id, SEL, id))[item methodForSelector: comp];
|
|
if (imp == 0)
|
|
{
|
|
[NSException raise: NSGenericException
|
|
format: @"Attempt to find position with unknown method"];
|
|
}
|
|
|
|
oaiSel = @selector(objectAtIndex:);
|
|
oai = [self methodForSelector: oaiSel];
|
|
/*
|
|
* Binary search for an item equal to the one to be inserted.
|
|
*/
|
|
for (index = upper/2; upper != lower; index = lower+(upper-lower)/2)
|
|
{
|
|
NSComparisonResult comparison;
|
|
|
|
comparison = (*imp)(item, comp, (*oai)(self, oaiSel, index));
|
|
if (comparison == NSOrderedAscending)
|
|
{
|
|
upper = index;
|
|
}
|
|
else if (comparison == NSOrderedDescending)
|
|
{
|
|
lower = index + 1;
|
|
}
|
|
else
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
/*
|
|
* Now skip past any equal items so the insertion point is AFTER any
|
|
* items that are equal to the new one.
|
|
*/
|
|
while (index < count
|
|
&& (*imp)(item, comp, (*oai)(self, oaiSel, index)) != NSOrderedAscending)
|
|
{
|
|
index++;
|
|
}
|
|
return index;
|
|
}
|
|
|
|
@end
|