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

Number rewrite broke subclasses ... fix to check for that.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@30693 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2010-06-12 19:13:23 +00:00
parent 23b7ff95cd
commit cdd3ef3c76
2 changed files with 85 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2010-06-12 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSNumber.m: Fix breakage of +numberWith... in subclasses.
2010-06-12 Yavor Doganov
* Source/NSZone.m:

84
Source/NSNumber.m
View file

@ -411,6 +411,11 @@ if (aValue >= -1 && aValue <= 12)\
+ (NSNumber *) numberWithBool: (BOOL)aValue
{
if (self != NSNumberClass)
{
return [[[self alloc] initWithBytes: (const void *)&aValue
objCType: @encode(BOOL)] autorelease];
}
CHECK_SINGLETON (((signed char) aValue));
return [self numberWithInt: aValue];
// Not reached (BOOL is always 0 or 1)
@ -418,21 +423,41 @@ if (aValue >= -1 && aValue <= 12)\
+ (NSNumber *) numberWithChar: (signed char)aValue
{
if (self != NSNumberClass)
{
return [[[self alloc] initWithBytes: (const void *)&aValue
objCType: @encode(char)] autorelease];
}
return [self numberWithInt: aValue];
}
+ (NSNumber *) numberWithUnsignedChar: (unsigned char)aValue
{
if (self != NSNumberClass)
{
return [[[self alloc] initWithBytes: (const void *)&aValue
objCType: @encode(unsigned char)] autorelease];
}
return [self numberWithInt: aValue];
}
+ (NSNumber *) numberWithShort: (short)aValue
{
if (self != NSNumberClass)
{
return [[[self alloc] initWithBytes: (const void *)&aValue
objCType: @encode(short)] autorelease];
}
return [self numberWithInt: aValue];
}
+ (NSNumber *) numberWithUnsignedShort: (unsigned short)aValue
{
if (self != NSNumberClass)
{
return [[[self alloc] initWithBytes: (const void *)&aValue
objCType: @encode(unsigned short)] autorelease];
}
return [self numberWithInt: aValue];
}
@ -440,6 +465,12 @@ if (aValue >= -1 && aValue <= 12)\
{
NSIntNumber *n;
if (self != NSNumberClass)
{
return [[[self alloc] initWithBytes: (const void *)&aValue
objCType: @encode(int)] autorelease];
}
CHECK_SINGLETON (aValue);
n = NSAllocateObject (NSIntNumberClass, 0, 0);
n->value = aValue;
@ -448,8 +479,13 @@ if (aValue >= -1 && aValue <= 12)\
+ (NSNumber *) numberWithUnsignedInt: (unsigned int)aValue
{
CHECK_SINGLETON (aValue);
if (self != NSNumberClass)
{
return [[[self alloc] initWithBytes: (const void *)&aValue
objCType: @encode(unsigned int)] autorelease];
}
CHECK_SINGLETON (aValue);
if (aValue < (unsigned int) INT_MAX)
{
return [self numberWithInt: (int)aValue];
@ -459,11 +495,21 @@ if (aValue >= -1 && aValue <= 12)\
+ (NSNumber *) numberWithLong: (long)aValue
{
if (self != NSNumberClass)
{
return [[[self alloc] initWithBytes: (const void *)&aValue
objCType: @encode(long)] autorelease];
}
return [self numberWithLongLong: aValue];
}
+ (NSNumber *) numberWithUnsignedLong: (unsigned long)aValue
{
if (self != NSNumberClass)
{
return [[[self alloc] initWithBytes: (const void *)&aValue
objCType: @encode(unsigned long)] autorelease];
}
return [self numberWithUnsignedLongLong: aValue];
}
@ -471,6 +517,11 @@ if (aValue >= -1 && aValue <= 12)\
{
NSLongLongNumber *n;
if (self != NSNumberClass)
{
return [[[self alloc] initWithBytes: (const void *)&aValue
objCType: @encode(long long)] autorelease];
}
CHECK_SINGLETON (aValue);
if (aValue < (long long)INT_MAX && aValue > (long long)INT_MIN)
{
@ -485,6 +536,11 @@ if (aValue >= -1 && aValue <= 12)\
{
NSUnsignedLongLongNumber *n;
if (self != NSNumberClass)
{
return [[[self alloc] initWithBytes: (const void *)&aValue
objCType: @encode(unsigned long long)] autorelease];
}
if (aValue < (unsigned long long) LLONG_MAX)
{
return [self numberWithLongLong: (long long) aValue];
@ -496,22 +552,39 @@ if (aValue >= -1 && aValue <= 12)\
+ (NSNumber *) numberWithFloat: (float)aValue
{
NSFloatNumber *n = NSAllocateObject (NSFloatNumberClass, 0, 0);
NSFloatNumber *n;
if (self != NSNumberClass)
{
return [[[self alloc] initWithBytes: (const void *)&aValue
objCType: @encode(float)] autorelease];
}
n = NSAllocateObject (NSFloatNumberClass, 0, 0);
n->value = aValue;
return AUTORELEASE(n);
}
+ (NSNumber *) numberWithDouble: (double)aValue
{
NSDoubleNumber *n = NSAllocateObject (NSDoubleNumberClass, 0, 0);
NSDoubleNumber *n;
if (self != NSNumberClass)
{
return [[[self alloc] initWithBytes: (const void *)&aValue
objCType: @encode(double)] autorelease];
}
n = NSAllocateObject (NSDoubleNumberClass, 0, 0);
n->value = aValue;
return AUTORELEASE(n);
}
+ (NSNumber *) numberWithInteger: (NSInteger)aValue
{
if (self != NSNumberClass)
{
return [[[self alloc] initWithBytes: (const void *)&aValue
objCType: @encode(NSInteger)] autorelease];
}
// Compile time constant; the compiler will remove this conditional
if (sizeof (NSInteger) == sizeof (int))
{
@ -522,6 +595,11 @@ if (aValue >= -1 && aValue <= 12)\
+ (NSNumber *) numberWithUnsignedInteger: (NSUInteger)aValue
{
if (self != NSNumberClass)
{
return [[[self alloc] initWithBytes: (const void *)&aValue
objCType: @encode(NSUInteger)] autorelease];
}
// Compile time constant; the compiler will remove this conditional
if (sizeof (NSUInteger) == sizeof (unsigned int))
{