gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-25 01:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSDecimalNumber.m ([initWithBytes:objCType:]): Implement

Browse source 
initialization with scalar types.  Use GSPrivateDefaultLocale
	to initialze intermediate string to match expectations of
	initWithString.	


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@25655 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2007-12-02 10:50:37 +00:00
parent 7728ffb868
commit b6fde8d6fa
2 changed files with 148 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,6 +1,10 @@
2007-12-02 David Ayers <ayers@fsfe.org> 2007-12-02 David Ayers <ayers@fsfe.org>
* Source/NSDecimal.m (GSDecimalDouble): Use NAN when available. * Source/NSDecimal.m (GSDecimalDouble): Use NAN when available.
* Source/NSDecimalNumber.m ([initWithBytes:objCType:]): Implement
initialization with scalar types. Use GSPrivateDefaultLocale
to initialze intermediate string to match expectations of
initWithString.
2007-11-30 Richard Frith-Macdonald <rfm@gnu.org> 2007-11-30 Richard Frith-Macdonald <rfm@gnu.org>

151
Source/NSDecimalNumber.m
View file

@ -26,6 +26,9 @@
$Date$ $Revision$ $Date$ $Revision$
*/ */
#define _GNU_SOURCE
#include <math.h>
#include "Foundation/NSCoder.h" #include "Foundation/NSCoder.h"
#include "Foundation/NSDecimal.h" #include "Foundation/NSDecimal.h"
#include "Foundation/NSDecimalNumber.h" #include "Foundation/NSDecimalNumber.h"
@ -235,14 +238,148 @@ static NSDecimalNumber *one;
*/ */
- (id) initWithBytes: (const void*)value objCType: (const char*)type - (id) initWithBytes: (const void*)value objCType: (const char*)type
{ {
double tmp; unsigned long long val;
NSString *s; long long llval;
NSDecimal decimal;
BOOL negative, llvalSet;
memcpy(&tmp, value, sizeof(tmp)); if (strlen(type) != 1)
s = [[NSString alloc] initWithFormat: @"%g", tmp]; {
self = [self initWithString: s]; DESTROY(self);
RELEASE(s); return nil;
return self; }
llvalSet = YES;
negative = NO;
switch (*type)
{
case _C_CHR:
{
signed char v = *(signed char *)value;
llval = (long long)v;
break;
}
case _C_UCHR:
{
unsigned char v = *(unsigned char *)value;
llval = (long long)v;
break;
}
case _C_SHT:
{
short v = *(short *)value;
llval = (long long)v;
break;
}
case _C_USHT:
{
unsigned short v = *(unsigned short *)value;
llval = (long long)v;
break;
}
case _C_INT:
{
int v = *(int *)value;
llval = (long long)v;
break;
}
case _C_UINT:
{
unsigned int v = *(unsigned int *)value;
llval = (long long)v;
break;
}
case _C_LNG:
{
long v = *(long *)value;
llval = (long long)v;
break;
}
case _C_ULNG:
{
unsigned long v = *(unsigned long *)value;
llval = (long long)v;
break;
}
#ifdef _C_LNGLNG
case _C_LNGLNG:
#else
case 'q':
#endif
{
long long v = *(long long *)value;
llval = (long long)v;
break;
}
#ifdef _C_ULNGLNG
case _C_ULNGLNG:
#else
case 'Q':
#endif
default:
{
llvalSet = NO;
break;
}
}
if (llvalSet)
{
if (llval<0)
{
negative = YES;
llval *= -1;
}
val = llval;
}
else
{
switch (*type)
{
case _C_FLT:
/* FIXME: This is better implemented with GMP where available. */
{
NSString *s;
float v = *(float *)value;
if (isnanf(v)) return notANumber;
if (isinff(v)) return (v < 0.0) ? minNumber : maxNumber;
s = [[NSString alloc] initWithFormat: @"%g"
locale: GSPrivateDefaultLocale(), (double)v];
self = [self initWithString: s];
RELEASE(s);
return self;
break;
}
case _C_DBL:
/* FIXME: This is better implemented with GMP where available. */
{
NSString *s;
double v = *(double *)value;
if (isnan(v)) return notANumber;
if (isinf(v)) return (v < 0.0) ? minNumber : maxNumber;
s = [[NSString alloc] initWithFormat: @"%g"
locale: GSPrivateDefaultLocale(), v];
self = [self initWithString: s];
RELEASE(s);
return self;
break;
}
#ifdef _C_ULNGLNG
case _C_ULNGLNG:
#else
case 'Q':
#endif
{
val = *(unsigned long long *)value;
break;
}
}
}
NSDecimalFromComponents(&decimal, val,
0, negative);
return [self initWithDecimal: decimal];
} }
- (id) initWithDecimal: (NSDecimal)decimal - (id) initWithDecimal: (NSDecimal)decimal