hg/stx-libbasic: comparison LongFloat.st

equal deleted inserted replaced

-:869510c58b9c
+:abee9fcb0385
 #ifndef __OPTIMIZE__
 # define __OPTIMIZE__
 #endif
 #define __USE_ISOC9X 1
+#define __USE_ISOC99 1
 #include <math.h>
 /*
 * on some systems errno is a macro ... check for it here
 */
 * no finite(x) ?
 * no isnan(x) ?
 */
 # ifndef isnanl
 #  define isnanl(x)      \
-	((((unsigned int *)(&x))[0] == 0x00000000) && \
+((((unsigned int *)(&x))[0] == 0x00000000) && \
-	 (((unsigned int *)(&x))[1] == 0xC0000000) && \
+(((unsigned int *)(&x))[1] == 0xC0000000) && \
-	 (((unsigned short *)(&x))[4] == 0xFFFF))
+(((unsigned short *)(&x))[4] == 0xFFFF))
 # endif
 # ifndef isnan
 #  define isnan(x)      \
-	((((unsigned int *)(&x))[0] == 0x00000000) && \
+((((unsigned int *)(&x))[0] == 0x00000000) && \
-	 (((unsigned int *)(&x))[1] == 0xFFF80000))
+(((unsigned int *)(&x))[1] == 0xFFF80000))
 # endif
 # ifndef isPositiveInfinity
 #  define isPositiveInfinity(x) \
-	((((unsigned int *)(&x))[0] == 0x00000000) && \
+((((unsigned int *)(&x))[0] == 0x00000000) && \
-	 (((unsigned int *)(&x))[1] == 0x7FF00000))
+(((unsigned int *)(&x))[1] == 0x7FF00000))
 # endif
 # ifndef isNegativeInfinity
 #  define isPositiveInfinity(x) \
-	((((unsigned int *)(&x))[0] == 0x00000000) && \
+((((unsigned int *)(&x))[0] == 0x00000000) && \
-	 (((unsigned int *)(&x))[1] == 0xFFF00000))
+(((unsigned int *)(&x))[1] == 0xFFF00000))
 # endif
 # ifndef isinf
 #  define isinf(x) \
-	((((unsigned int *)(&x))[0] == 0x00000000) && \
+((((unsigned int *)(&x))[0] == 0x00000000) && \
-	 ((((unsigned int *)(&x))[1] & 0x7FF00000) == 0x7FF00000))
+((((unsigned int *)(&x))[1] & 0x7FF00000) == 0x7FF00000))
 # endif
 # ifndef finite
 #  define finite(x) (!isinf(x) && !isnan(x))
 # endif
 # define NO_ACOSH
 # define NO_ATANH
 #endif /* WIN32 */
 #ifdef realIX
-/*
+# ifndef isfinite
-* no finite(x)
+#  define isfinite(x)     1
-*/
-# ifndef finite
-#  define finite(x)     1
 # endif
 #endif /* realIX */
-#ifdef OSX
-# ifndef isnanl
-#  define isnanl(x)	isnan(x)
-# endif
-#endif /* OSX */
 #if defined(__GNUC__) || defined(WIN32)
 # define LONGFLOAT      long double
 # if defined(linux) || defined(WIN32)
 # define LONGFLOAT_CLASS LongFloat
 # define LONGFLOAT_GLOBAL @global(LongFloat)
 #endif
 struct __longfloatstruct {
-	HEADER
+HEADER
 #ifdef __NEED_DOUBLE_ALIGN
-	__FILLTYPE_DOUBLE       f_filler;
+__FILLTYPE_DOUBLE       f_filler;
 #endif
-	LONGFLOAT               f_longfloatvalue;
+LONGFLOAT               f_longfloatvalue;
 };
 #define __LongFloatInstPtr(obj)      ((struct __longfloatstruct *)(__objPtr(obj)))
 #ifndef __longFloatVal
 # define __longFloatVal(o) \
-	__LongFloatInstPtr(o)->f_longfloatvalue
+__LongFloatInstPtr(o)->f_longfloatvalue
 #endif
 #ifndef __qMKLFLOAT
 # define __qMKLFLOAT(__newFloat__, __fVal__) \
 { \
-	__qNew(__newFloat__ , sizeof(struct __longfloatstruct)); \
+__qNew(__newFloat__ , sizeof(struct __longfloatstruct)); \
-	if (__newFloat__) { \
+if (__newFloat__) { \
-	    __qClass(__newFloat__) = LONGFLOAT_GLOBAL; \
+__qClass(__newFloat__) = LONGFLOAT_GLOBAL; \
-	    __LongFloatInstPtr(__newFloat__)->f_longfloatvalue = (LONGFLOAT)(__fVal__); \
+__LongFloatInstPtr(__newFloat__)->f_longfloatvalue = (LONGFLOAT)(__fVal__); \
-	} \
+} \
 }
 #endif
 #ifndef __isLongFloat
 # define __isLongFloat(o) \
-	(__Class(o) == @global(LongFloat))
+(__Class(o) == @global(LongFloat))
 #endif
 #ifndef __qIsLongFloat
 # define __qIsLongFloat(o) \
-	(__qClass(o) == @global(LongFloat))
+(__qClass(o) == @global(LongFloat))
 #endif
 %}
 ! !
 %{  /* NOCONTEXT */
 LONGFLOAT fVal;
 fVal = __longFloatVal(self);
-#ifdef WIN32
+if (!LONG_isnan(fVal) && (fVal >= (LONGFLOAT)_MIN_INT) && (fVal <= (LONGFLOAT)_MAX_INT)) {
-if (! isnanl(fVal))
+RETURN ( __mkSmallInteger( (INT)fVal) );
-#endif
-if ((fVal >= (LONGFLOAT)_MIN_INT) && (fVal <= (LONGFLOAT)_MAX_INT)) {
-	RETURN ( __mkSmallInteger( (INT)fVal) );
 }
 %}.
 ^ super asInteger
 "
 #ifdef LONG_finite
 LONGFLOAT lV = __longFloatVal(self);
 if (LONG_finite(lV)) {
-	RETURN (true);
+RETURN (true);
 } else {
-	RETURN (false);
+RETURN (false);
 }
 #else
 double dV = (double) __longFloatVal(self);
-if (finite(dV)) {
+if (isfinite(dV)) {
-	RETURN (true);
+RETURN (true);
 } else {
-	RETURN (false);
+RETURN (false);
 }
 #endif
 %}
 "
-	1.0 asLongFloat isFinite
+1.0 asLongFloat isFinite
-	(0.0 asLongFloat uncheckedDivide: 0.0) isFinite
+(0.0 asLongFloat uncheckedDivide: 0.0) isFinite
-	(1.0 asLongFloat uncheckedDivide: 0.0) isFinite
+(1.0 asLongFloat uncheckedDivide: 0.0) isFinite
-	(-1.0 asLongFloat uncheckedDivide: 0.0) isFinite
+(-1.0 asLongFloat uncheckedDivide: 0.0) isFinite
 "
 !
 isNaN
 "return true, if the receiver is an invalid float (NaN - not a number).
 ! !
 !LongFloat class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/LongFloat.st,v 1.51 2005-07-08 17:15:01 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/LongFloat.st,v 1.52 2005-11-09 15:57:36 stefan Exp $'
 ! !
 LongFloat initialize!

changeset 8980	abee9fcb0385
parent 8913	b9498d27a554
child 8981	7c7b2a14c8b3