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

2004-01-31 Manuel Guesdon <mguesdon@orange-concept.com>

Browse source 
* Source/NSNumber.m: Modified numberWithXX: methods
	to test against abstractClass. If class is not the abstract
	class, we alloc object of class instead of allocating
	NSXXNumber objects (cf [NSDecimalNumber numberWithDouble:x]
	thread)


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@18515 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Manuel Guesdon 2004-01-31 16:28:35 +00:00
parent 1c24d6feb9
commit 9962ec6928
2 changed files with 208 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-01-31 Manuel Guesdon <mguesdon@orange-concept.com>
* Source/NSNumber.m: Modified numberWithXX: methods
to test against abstractClass. If class is not the abstract
class, we alloc object of class instead of allocating
NSXXNumber objects (cf [NSDecimalNumber numberWithDouble:x]
thread)
2004-01-30 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSString.m: Added two new MacOS-X initialisers.

273
Source/NSNumber.m
View file

@ -326,173 +326,302 @@ static Class doubleNumberClass;
+ (NSNumber*) numberWithBool: (BOOL)value
{
if (value == NO)
// if class is NSNumber, replace by appropriate object
if (self == abstractClass)
{
return boolN;
if (value == NO)
{
return boolN;
}
else
{
return boolY;
}
}
else
else // alloc class and init with object intWithXX method
{
return boolY;
return AUTORELEASE([[self allocWithZone: NSDefaultMallocZone()]
initWithBool: value]);
}
}
+ (NSNumber*) numberWithChar: (signed char)value
{
NSNumber *theObj;
NSNumber *theObj = nil;
if (value <= GS_SMALL && value >= -GS_SMALL)
// if class is NSNumber, replace by appropriate object
if (self == abstractClass)
{
return smallIntegers[value + GS_SMALL];
if (value <= GS_SMALL && value >= -GS_SMALL)
{
return smallIntegers[value + GS_SMALL];
}
theObj = (NSNumber*)NSAllocateObject(charNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
}
theObj = (NSNumber*)NSAllocateObject(charNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
else // alloc class and init with object intWithXX method
{
theObj = [[self allocWithZone: NSDefaultMallocZone()]
initWithChar: value];
}
return AUTORELEASE(theObj);
}
+ (NSNumber*) numberWithDouble: (double)value
{
NSNumber *theObj;
NSNumber *theObj = nil;
// if class is NSNumber, replace by appropriate object
if (self == abstractClass)
{
theObj = (NSNumber*)NSAllocateObject(doubleNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
}
else // alloc class and init with object intWithXX method
{
theObj = [[self allocWithZone: NSDefaultMallocZone()]
initWithDouble: value];
}
theObj = (NSNumber*)NSAllocateObject(doubleNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
return AUTORELEASE(theObj);
}
+ (NSNumber*) numberWithFloat: (float)value
{
NSNumber *theObj;
NSNumber *theObj = nil;
// if class is NSNumber, replace by appropriate object
if (self == abstractClass)
{
theObj = (NSNumber*)NSAllocateObject(floatNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
}
else // alloc class and init with object intWithXX method
{
theObj = [[self allocWithZone: NSDefaultMallocZone()]
initWithFloat: value];
}
theObj = (NSNumber*)NSAllocateObject(floatNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
return AUTORELEASE(theObj);
}
+ (NSNumber*) numberWithInt: (signed int)value
{
NSNumber *theObj;
NSNumber *theObj = nil;
if (value <= GS_SMALL && value >= -GS_SMALL)
// if class is NSNumber, replace by appropriate object
if (self == abstractClass)
{
return smallIntegers[value + GS_SMALL];
if (value <= GS_SMALL && value >= -GS_SMALL)
{
return smallIntegers[value + GS_SMALL];
}
theObj = (NSNumber*)NSAllocateObject(intNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
}
theObj = (NSNumber*)NSAllocateObject(intNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
else // alloc class and init with object intWithXX method
{
theObj = [[self allocWithZone: NSDefaultMallocZone()]
initWithInt: value];
}
return AUTORELEASE(theObj);
}
+ (NSNumber*) numberWithLong: (signed long)value
{
NSNumber *theObj;
NSNumber *theObj = nil;
if (value <= GS_SMALL && value >= -GS_SMALL)
// if class is NSNumber, replace by appropriate object
if (self == abstractClass)
{
return smallIntegers[value + GS_SMALL];
if (value <= GS_SMALL && value >= -GS_SMALL)
{
return smallIntegers[value + GS_SMALL];
}
theObj = (NSNumber*)NSAllocateObject(longNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
}
theObj = (NSNumber*)NSAllocateObject(longNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
else // alloc class and init with object intWithXX method
{
theObj = [[self allocWithZone: NSDefaultMallocZone()]
initWithLong: value];
}
return AUTORELEASE(theObj);
}
+ (NSNumber*) numberWithLongLong: (signed long long)value
{
NSNumber *theObj;
NSNumber *theObj = nil;
if (value <= GS_SMALL && value >= -GS_SMALL)
// if class is NSNumber, replace by appropriate object
if (self == abstractClass)
{
return smallIntegers[value + GS_SMALL];
if (value <= GS_SMALL && value >= -GS_SMALL)
{
return smallIntegers[value + GS_SMALL];
}
theObj = (NSNumber*)NSAllocateObject(longLongNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
}
theObj = (NSNumber*)NSAllocateObject(longLongNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
else // alloc class and init with object intWithXX method
{
theObj = [[self allocWithZone: NSDefaultMallocZone()]
initWithLongLong: value];
}
return AUTORELEASE(theObj);
}
+ (NSNumber*) numberWithShort: (signed short)value
{
NSNumber *theObj;
NSNumber *theObj = nil;
if (value <= GS_SMALL && value >= -GS_SMALL)
// if class is NSNumber, replace by appropriate object
if (self == abstractClass)
{
return smallIntegers[value + GS_SMALL];
if (value <= GS_SMALL && value >= -GS_SMALL)
{
return smallIntegers[value + GS_SMALL];
}
theObj = (NSNumber*)NSAllocateObject(shortNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
}
theObj = (NSNumber*)NSAllocateObject(shortNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
else // alloc class and init with object intWithXX method
{
theObj = [[self allocWithZone: NSDefaultMallocZone()]
initWithShort: value];
}
return AUTORELEASE(theObj);
}
+ (NSNumber*) numberWithUnsignedChar: (unsigned char)value
{
NSNumber *theObj;
NSNumber *theObj = nil;
if (value <= GS_SMALL)
// if class is NSNumber, replace by appropriate object
if (self == abstractClass)
{
return smallIntegers[value + GS_SMALL];
if (value <= GS_SMALL)
{
return smallIntegers[value + GS_SMALL];
}
theObj = (NSNumber*)NSAllocateObject(uCharNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
}
theObj = (NSNumber*)NSAllocateObject(uCharNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
else // alloc class and init with object intWithXX method
{
theObj = [[self allocWithZone: NSDefaultMallocZone()]
initWithUnsignedChar: value];
}
return AUTORELEASE(theObj);
}
+ (NSNumber*) numberWithUnsignedInt: (unsigned int)value
{
NSNumber *theObj;
NSNumber *theObj = nil;
if (value <= GS_SMALL)
// if class is NSNumber, replace by appropriate object
if (self == abstractClass)
{
return smallIntegers[value + GS_SMALL];
if (value <= GS_SMALL)
{
return smallIntegers[value + GS_SMALL];
}
theObj = (NSNumber*)NSAllocateObject(uIntNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
}
theObj = (NSNumber*)NSAllocateObject(uIntNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
else // alloc class and init with object intWithXX method
{
theObj = [[self allocWithZone: NSDefaultMallocZone()]
initWithUnsignedInt: value];
}
return AUTORELEASE(theObj);
}
+ (NSNumber*) numberWithUnsignedLong: (unsigned long)value
{
NSNumber *theObj;
NSNumber *theObj = nil;
if (value <= GS_SMALL)
// if class is NSNumber, replace by appropriate object
if (self == abstractClass)
{
return smallIntegers[value + GS_SMALL];
if (value <= GS_SMALL)
{
return smallIntegers[value + GS_SMALL];
}
theObj = (NSNumber*)NSAllocateObject(uLongNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
}
theObj = (NSNumber*)NSAllocateObject(uLongNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
else // alloc class and init with object intWithXX method
{
theObj = [[self allocWithZone: NSDefaultMallocZone()]
initWithUnsignedLong: value];
}
return AUTORELEASE(theObj);
}
+ (NSNumber*) numberWithUnsignedLongLong: (unsigned long long)value
{
NSNumber *theObj;
NSNumber *theObj = nil;
if (value <= GS_SMALL)
// if class is NSNumber, replace by appropriate object
if (self == abstractClass)
{
return smallIntegers[value + GS_SMALL];
if (value <= GS_SMALL)
{
return smallIntegers[value + GS_SMALL];
}
theObj = (NSNumber*)NSAllocateObject(uLongLongNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
}
theObj = (NSNumber*)NSAllocateObject(uLongLongNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
else // alloc class and init with object intWithXX method
{
theObj = [[self allocWithZone: NSDefaultMallocZone()]
initWithUnsignedLongLong: value];
}
return AUTORELEASE(theObj);
}
+ (NSNumber*) numberWithUnsignedShort: (unsigned short)value
{
NSNumber *theObj;
NSNumber *theObj = nil;
if (value <= GS_SMALL)
// if class is NSNumber, replace by appropriate object
if (self == abstractClass)
{
return smallIntegers[value + GS_SMALL];
if (value <= GS_SMALL)
{
return smallIntegers[value + GS_SMALL];
}
theObj = (NSNumber*)NSAllocateObject(uShortNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
}
theObj = (NSNumber*)NSAllocateObject(uShortNumberClass, 0,
NSDefaultMallocZone());
theObj = [theObj initWithBytes: &value objCType: NULL];
else // alloc class and init with object intWithXX method
{
theObj = [[self allocWithZone: NSDefaultMallocZone()]
initWithUnsignedShort: value];
}
return AUTORELEASE(theObj);
}