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

fixes to conform to coding style

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35477 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-08-29 08:54:46 +00:00
parent 739c0c8ece
commit 7fd19938a5
1 changed files with 102 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Source/NSIndexSet.m
View file

@ -864,13 +864,13 @@ static NSUInteger posForIndex(GSIArray array, NSUInteger index)
}
- (void)enumerateIndexesInRange: (NSRange)range
- (void) enumerateIndexesInRange: (NSRange)range
options: (NSEnumerationOptions)opts
usingBlock: (GSIndexSetEnumerationBlock)aBlock
{
NSUInteger lastInRange = (NSMaxRange(range) - 1);
NSUInteger startArrayIndex = posForIndex(_array, range.location);
NSUInteger endArrayIndex = MIN(posForIndex(_array, lastInRange), (GSIArrayCount(_array) - 1));
NSUInteger lastInRange;
NSUInteger startArrayIndex;
NSUInteger endArrayIndex;
NSUInteger i;
NSUInteger c;
BOOL isReverse = opts & NSEnumerationReverse;
@ -881,11 +881,15 @@ static NSUInteger posForIndex(GSIArray array, NSUInteger index)
return;
}
startArrayIndex = posForIndex(_array, range.location);
if (NSNotFound == startArrayIndex)
{
startArrayIndex = 0;
}
lastInRange = (NSMaxRange(range) - 1);
endArrayIndex = MIN(posForIndex(_array, lastInRange),
(GSIArrayCount(_array) - 1));
if (NSNotFound == endArrayIndex)
{
endArrayIndex = GSIArrayCount(_array) - 1;
@ -908,6 +912,7 @@ static NSUInteger posForIndex(GSIArray array, NSUInteger index)
NSRange r = GSIArrayItemAtIndex(_array, i).ext;
NSUInteger innerI;
NSUInteger innerC;
if (isReverse)
{
innerI = NSMaxRange(r) - 1;
@ -922,7 +927,9 @@ static NSUInteger posForIndex(GSIArray array, NSUInteger index)
{
if ((innerI <= lastInRange) && (innerI >= range.location))
{
GS_DISPATCH_SUBMIT_BLOCK(enumQueueGroup, enumQueue, if (shouldStop) {return;}, return;, aBlock, innerI, &shouldStop);
GS_DISPATCH_SUBMIT_BLOCK(enumQueueGroup, enumQueue,
if (shouldStop) {return;}, return;,
aBlock, innerI, &shouldStop);
}
if (shouldStop)
{
@ -963,21 +970,28 @@ static NSUInteger posForIndex(GSIArray array, NSUInteger index)
}
- (void)enumerateIndexesWithOptions: (NSEnumerationOptions)opts
- (void) enumerateIndexesWithOptions: (NSEnumerationOptions)opts
usingBlock: (GSIndexSetEnumerationBlock)aBlock
{
NSUInteger firstIndex = [self firstIndex];
NSUInteger lastIndex = [self lastIndex];
NSUInteger firstIndex;
NSUInteger lastIndex;
NSRange range;
firstIndex = [self firstIndex];
if (NSNotFound == firstIndex)
{
return;
}
[self enumerateIndexesInRange: NSMakeRange(firstIndex, ((lastIndex - firstIndex) + 1))
lastIndex = [self lastIndex];
range = NSMakeRange(firstIndex, ((lastIndex - firstIndex) + 1));
[self enumerateIndexesInRange: range
options: opts
usingBlock: aBlock];
}
- (void)enumerateIndexesUsingBlock: (GSIndexSetEnumerationBlock)aBlock
- (void) enumerateIndexesUsingBlock: (GSIndexSetEnumerationBlock)aBlock
{
[self enumerateIndexesWithOptions: 0
usingBlock: aBlock];