gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

minor whitespace tidyups

Browse source
This commit is contained in:
Richard Frith-Macdonald 2018-12-04 11:09:18 +00:00
parent b1c858639a
commit 7380e850e4
2 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Source/NSNumber.m
View file

@ -658,16 +658,16 @@ static NSBoolNumber *boolN; // Boolean NO (integer 0)
NSFloatNumberClass = [NSFloatNumber class];
NSDoubleNumberClass = [NSDoubleNumber class];
boolY = NSAllocateObject (NSBoolNumberClass, 0, 0);
boolY = NSAllocateObject(NSBoolNumberClass, 0, 0);
[[NSObject leakAt: &boolY] release];
boolY->value = 1;
boolN = NSAllocateObject (NSBoolNumberClass, 0, 0);
boolN = NSAllocateObject(NSBoolNumberClass, 0, 0);
boolN->value = 0;
[[NSObject leakAt: &boolN] release];
for (i = 0; i < 14; i++)
{
NSIntNumber *n = NSAllocateObject (NSIntNumberClass, 0, 0);
NSIntNumber *n = NSAllocateObject(NSIntNumberClass, 0, 0);
n->value = i - 1;
ReusedInstances[i] = n;
@ -818,7 +818,7 @@ if (aValue >= -1 && aValue <= 12)\
objCType: @encode(int)] autorelease];
}
CHECK_SINGLETON (aValue);
CHECK_SINGLETON(aValue);
#ifdef OBJC_SMALL_OBJECT_SHIFT
if (useSmallInt
&& (aValue < (INT_MAX>>OBJC_SMALL_OBJECT_SHIFT))
@ -828,7 +828,7 @@ if (aValue >= -1 && aValue <= 12)\
| SMALL_INT_MASK);
}
#endif
n = NSAllocateObject (NSIntNumberClass, 0, 0);
n = NSAllocateObject(NSIntNumberClass, 0, 0);
n->value = aValue;
return AUTORELEASE(n);
}
@ -841,7 +841,7 @@ if (aValue >= -1 && aValue <= 12)\
objCType: @encode(unsigned int)] autorelease];
}
CHECK_SINGLETON (aValue);
CHECK_SINGLETON(aValue);
if (aValue < (unsigned int) INT_MAX)
{
return [self numberWithInt: (int)aValue];
@ -878,12 +878,12 @@ if (aValue >= -1 && aValue <= 12)\
return [[[self alloc] initWithBytes: (const void *)&aValue
objCType: @encode(long long)] autorelease];
}
CHECK_SINGLETON (aValue);
CHECK_SINGLETON(aValue);
if (aValue < (long long)INT_MAX && aValue > (long long)INT_MIN)
{
return [self numberWithInt: (int) aValue];
}
n = NSAllocateObject (NSLongLongNumberClass, 0, 0);
n = NSAllocateObject(NSLongLongNumberClass, 0, 0);
n->value = aValue;
return AUTORELEASE(n);
}
@ -901,7 +901,7 @@ if (aValue >= -1 && aValue <= 12)\
{
return [self numberWithLongLong: (long long) aValue];
}
n = NSAllocateObject (NSUnsignedLongLongNumberClass, 0, 0);
n = NSAllocateObject(NSUnsignedLongLongNumberClass, 0, 0);
n->value = aValue;
return AUTORELEASE(n);
}
@ -921,7 +921,7 @@ if (aValue >= -1 && aValue <= 12)\
return boxDouble(aValue, SMALL_FLOAT_MASK);
}
#endif
n = NSAllocateObject (NSFloatNumberClass, 0, 0);
n = NSAllocateObject(NSFloatNumberClass, 0, 0);
n->value = aValue;
return AUTORELEASE(n);
}
@ -945,7 +945,7 @@ if (aValue >= -1 && aValue <= 12)\
return boxDouble(aValue, SMALL_EXTENDED_DOUBLE_MASK);
}
#endif
n = NSAllocateObject (NSDoubleNumberClass, 0, 0);
n = NSAllocateObject(NSDoubleNumberClass, 0, 0);
n->value = aValue;
return AUTORELEASE(n);
}

25
Source/NSOperation.m
View file

@ -206,8 +206,7 @@ static NSArray *empty = nil;
{
NSOperation *op;
[self removeObserver: self
forKeyPath: @"isFinished"];
[self removeObserver: self forKeyPath: @"isFinished"];
while ((op = [internal->dependencies lastObject]) != nil)
{
[self removeDependency: op];
@ -300,8 +299,7 @@ static NSArray *empty = nil;
* observer once we know the operation has finished since it can never
* become unfinished.
*/
[object removeObserver: self
forKeyPath: @"isFinished"];
[object removeObserver: self forKeyPath: @"isFinished"];
if (object == self)
{
@ -352,8 +350,7 @@ static NSArray *empty = nil;
{
if (NSNotFound != [internal->dependencies indexOfObjectIdenticalTo: op])
{
[op removeObserver: self
forKeyPath: @"isFinished"];
[op removeObserver: self forKeyPath: @"isFinished"];
[self willChangeValueForKey: @"dependencies"];
[internal->dependencies removeObject: op];
if (NO == internal->ready)
@ -436,12 +433,6 @@ static NSArray *empty = nil;
[internal->lock lock];
NS_DURING
{
if (YES == [self isConcurrent])
{
[NSException raise: NSInvalidArgumentException
format: @"[%@-%@] called on concurrent operation",
NSStringFromClass([self class]), NSStringFromSelector(_cmd)];
}
if (YES == [self isExecuting])
{
[NSException raise: NSInvalidArgumentException
@ -889,8 +880,7 @@ static NSOperationQueue *mainQueue = nil;
{
[internal->lock lock];
internal->executing--;
[object removeObserver: self
forKeyPath: @"isFinished"];
[object removeObserver: self forKeyPath: @"isFinished"];
[internal->lock unlock];
[self willChangeValueForKey: @"operations"];
[self willChangeValueForKey: @"operationCount"];
@ -973,11 +963,8 @@ static NSOperationQueue *mainQueue = nil;
{
NSAutoreleasePool *opPool = [NSAutoreleasePool new];
if (NO == [op isCancelled])
{
[NSThread setThreadPriority: [op threadPriority]];
[op main];
}
[NSThread setThreadPriority: [op threadPriority]];
[op start];
RELEASE(opPool);
}
NS_HANDLER