Index: src/OFNumber.h ================================================================== --- src/OFNumber.h +++ src/OFNumber.h @@ -55,14 +55,14 @@ */ @interface OFNumber: OFObject { union of_number_value { BOOL bool_; - char char_; - short short_; - int int_; - long long_; + signed char char_; + signed short short_; + signed int int_; + signed long long_; unsigned char uchar; unsigned short ushort; unsigned int uint; unsigned long ulong; int8_t int8; @@ -85,565 +85,690 @@ } value; of_number_type_t type; } /** + * \brief Creates a new OFNumber with the specified BOOL. + * * \param bool_ A BOOL which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithBool: (BOOL)bool_; /** - * \param char_ A char which the OFNumber should contain - * \return A new autoreleased OFNumber - */ -+ numberWithChar: (char)char_; - -/** - * \param short_ A short which the OFNumber should contain - * \return A new autoreleased OFNumber - */ -+ numberWithShort: (short)short_; - -/** - * \param int_ An int which the OFNumber should contain - * \return A new autoreleased OFNumber - */ -+ numberWithInt: (int)int_; - -/** - * \param long_ A long which the OFNumber should contain - * \return A new autoreleased OFNumber - */ -+ numberWithLong: (long)long_; - -/** + * \brief Creates a new OFNumber with the specified signed char. + * + * \param char_ A signed char which the OFNumber should contain + * \return A new autoreleased OFNumber + */ ++ numberWithChar: (signed char)char_; + +/** + * \brief Creates a new OFNumber with the specified signed short. + * + * \param short_ A signed short which the OFNumber should contain + * \return A new autoreleased OFNumber + */ ++ numberWithShort: (signed short)short_; + +/** + * \brief Creates a new OFNumber with the specified signed int. + * + * \param int_ A signed int which the OFNumber should contain + * \return A new autoreleased OFNumber + */ ++ numberWithInt: (signed int)int_; + +/** + * \brief Creates a new OFNumber with the specified signed long. + * + * \param long_ A signed long which the OFNumber should contain + * \return A new autoreleased OFNumber + */ ++ numberWithLong: (signed long)long_; + +/** + * \brief Creates a new OFNumber with the specified unsigned char. + * * \param uchar An unsigned char which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithUnsignedChar: (unsigned char)uchar; /** + * \brief Creates a new OFNumber with the specified unsigned short. + * * \param ushort An unsigned short which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithUnsignedShort: (unsigned short)ushort; /** + * \brief Creates a new OFNumber with the specified unsigned int. + * * \param uint An unsigned int which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithUnsignedInt: (unsigned int)uint; /** + * \brief Creates a new OFNumber with the specified unsigned long. + * * \param ulong An unsigned long which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithUnsignedLong: (unsigned long)ulong; /** + * \brief Creates a new OFNumber with the specified int8_t. + * * \param int8 An int8_t which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithInt8: (int8_t)int8; /** + * \brief Creates a new OFNumber with the specified int16_t. + * * \param int16 An int16_t which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithInt16: (int16_t)int16; /** + * \brief Creates a new OFNumber with the specified int32_t. + * * \param int32 An int32_t which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithInt32: (int32_t)int32; /** + * \brief Creates a new OFNumber with the specified int64_t. + * * \param int64 An int64_t which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithInt64: (int64_t)int64; /** + * \brief Creates a new OFNumber with the specified uint8_t. + * * \param uint8 A uint8_t which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithUInt8: (uint8_t)uint8; /** + * \brief Creates a new OFNumber with the specified uint16_t. + * * \param uint16 A uint16_t which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithUInt16: (uint16_t)uint16; /** + * \brief Creates a new OFNumber with the specified uint32_t. + * * \param uint32 A uint32_t which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithUInt32: (uint32_t)uint32; /** + * \brief Creates a new OFNumber with the specified uint64_t. + * * \param uint64 A uint64_t which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithUInt64: (uint64_t)uint64; /** + * \brief Creates a new OFNumber with the specified size_t. + * * \param size A size_t which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithSize: (size_t)size; /** + * \brief Creates a new OFNumber with the specified ssize_t. + * * \param ssize An ssize_t which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithSSize: (ssize_t)ssize; /** + * \brief Creates a new OFNumber with the specified intmax_t. + * * \param intmax An intmax_t which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithIntMax: (intmax_t)intmax; /** + * \brief Creates a new OFNumber with the specified uintmax_t. + * * \param uintmax A uintmax_t which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithUIntMax: (uintmax_t)uintmax; /** + * \brief Creates a new OFNumber with the specified ptrdiff_t. + * * \param ptrdiff A ptrdiff_t which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithPtrDiff: (ptrdiff_t)ptrdiff; /** + * \brief Creates a new OFNumber with the specified intptr_t. + * * \param intptr An intptr_t which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithIntPtr: (intptr_t)intptr; /** + * \brief Creates a new OFNumber with the specified uintptr_t. + * * \param uintptr A uintptr_t which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithUIntPtr: (uintptr_t)uintptr; /** + * \brief Creates a new OFNumber with the specified float. + * * \param float_ A float which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithFloat: (float)float_; /** + * \brief Creates a new OFNumber with the specified double. + * * \param double_ A double which the OFNumber should contain * \return A new autoreleased OFNumber */ + numberWithDouble: (double)double_; /** - * Initializes an already allocated OFNumber with the specified BOOL. + * \brief Initializes an already allocated OFNumber with the specified BOOL. * * \param bool_ A BOOL which the OFNumber should contain * \return An initialized OFNumber */ - initWithBool: (BOOL)bool_; /** - * Initializes an already allocated OFNumber with the specified char. - * - * \param char_ A char which the OFNumber should contain - * \return An initialized OFNumber - */ -- initWithChar: (char)char_; - -/** - * Initializes an already allocated OFNumber with the specified short. - * - * \param short_ A short which the OFNumber should contain - * \return An initialized OFNumber - */ -- initWithShort: (short)short_; - -/** - * Initializes an already allocated OFNumber with the specified int. - * - * \param int_ An int which the OFNumber should contain - * \return An initialized OFNumber - */ -- initWithInt: (int)int_; - -/** - * Initializes an already allocated OFNumber with the specified long. - * - * \param long_ A long which the OFNumber should contain - * \return An initialized OFNumber - */ -- initWithLong: (long)long_; - -/** - * Initializes an already allocated OFNumber with the specified unsigned char. + * \brief Initializes an already allocated OFNumber with the specified signed + * char. + * + * \param char_ A signed char which the OFNumber should contain + * \return An initialized OFNumber + */ +- initWithChar: (signed char)char_; + +/** + * \brief Initializes an already allocated OFNumber with the specified signed + * short. + * + * \param short_ A signed short which the OFNumber should contain + * \return An initialized OFNumber + */ +- initWithShort: (signed short)short_; + +/** + * \brief Initializes an already allocated OFNumber with the specified signed + * int. + * + * \param int_ A signed int which the OFNumber should contain + * \return An initialized OFNumber + */ +- initWithInt: (signed int)int_; + +/** + * \brief Initializes an already allocated OFNumber with the specified signed + * long. + * + * \param long_ A signed long which the OFNumber should contain + * \return An initialized OFNumber + */ +- initWithLong: (signed long)long_; + +/** + * \brief Initializes an already allocated OFNumber with the specified unsigned + * char. * * \param uchar An unsigned char which the OFNumber should contain * \return An initialized OFNumber */ - initWithUnsignedChar: (unsigned char)uchar; /** - * Initializes an already allocated OFNumber with the specified unsigned short. + * \brief Initializes an already allocated OFNumber with the specified unsigned + * short. * * \param ushort An unsigned short which the OFNumber should contain * \return An initialized OFNumber */ - initWithUnsignedShort: (unsigned short)ushort; /** - * Initializes an already allocated OFNumber with the specified unsigned int . + * \brief Initializes an already allocated OFNumber with the specified unsigned + * int. * * \param uint An unsigned int which the OFNumber should contain * \return An initialized OFNumber */ - initWithUnsignedInt: (unsigned int)uint; /** - * Initializes an already allocated OFNumber with the specified unsigned long. + * \brief Initializes an already allocated OFNumber with the specified unsigned + * long. * * \param ulong An unsigned long which the OFNumber should contain * \return An initialized OFNumber */ - initWithUnsignedLong: (unsigned long)ulong; /** - * Initializes an already allocated OFNumber with the specified int8_t. + * \brief Initializes an already allocated OFNumber with the specified int8_t. * * \param int8 An int8_t which the OFNumber should contain * \return An initialized OFNumber */ - initWithInt8: (int8_t)int8; /** - * Initializes an already allocated OFNumber with the specified int16_t. + * \brief Initializes an already allocated OFNumber with the specified int16_t. * * \param int16 An int16_t which the OFNumber should contain * \return An initialized OFNumber */ - initWithInt16: (int16_t)int16; /** - * Initializes an already allocated OFNumber with the specified int32_t. + * \brief Initializes an already allocated OFNumber with the specified int32_t. * * \param int32 An int32_t which the OFNumber should contain * \return An initialized OFNumber */ - initWithInt32: (int32_t)int32; /** - * Initializes an already allocated OFNumber with the specified int64_t. + * \brief Initializes an already allocated OFNumber with the specified int64_t. * * \param int64 An int64_t which the OFNumber should contain * \return An initialized OFNumber */ - initWithInt64: (int64_t)int64; /** - * Initializes an already allocated OFNumber with the specified uint8_t. + * \brief Initializes an already allocated OFNumber with the specified uint8_t. * * \param uint8 A uint8_t which the OFNumber should contain * \return An initialized OFNumber */ - initWithUInt8: (uint8_t)uint8; /** - * Initializes an already allocated OFNumber with the specified uint16_t. + * \brief Initializes an already allocated OFNumber with the specified uint16_t. * * \param uint16 A uint16_t which the OFNumber should contain * \return An initialized OFNumber */ - initWithUInt16: (uint16_t)uint16; /** - * Initializes an already allocated OFNumber with the specified uint32_t. + * \brief Initializes an already allocated OFNumber with the specified uint32_t. * * \param uint32 A uint32_t which the OFNumber should contain * \return An initialized OFNumber */ - initWithUInt32: (uint32_t)uint32; /** - * Initializes an already allocated OFNumber with the specified uint64_t. + * \brief Initializes an already allocated OFNumber with the specified uint64_t. * * \param uint64 A uint64_t which the OFNumber should contain * \return An initialized OFNumber */ - initWithUInt64: (uint64_t)uint64; /** - * Initializes an already allocated OFNumber with the specified size_t. + * \brief Initializes an already allocated OFNumber with the specified size_t. * * \param size A size_t which the OFNumber should contain * \return An initialized OFNumber */ - initWithSize: (size_t)size; /** - * Initializes an already allocated OFNumber with the specified ssize_t. + * \brief Initializes an already allocated OFNumber with the specified ssize_t. * * \param ssize An ssize_t which the OFNumber should contain * \return An initialized OFNumber */ - initWithSSize: (ssize_t)ssize; /** - * Initializes an already allocated OFNumber with the specified intmax_t. + * \brief Initializes an already allocated OFNumber with the specified intmax_t. * * \param intmax An intmax_t which the OFNumber should contain * \return An initialized OFNumber */ - initWithIntMax: (intmax_t)intmax; /** - * Initializes an already allocated OFNumber with the specified uintmax_t. + * \brief Initializes an already allocated OFNumber with the specified + * uintmax_t. * * \param uintmax A uintmax_t which the OFNumber should contain * \return An initialized OFNumber */ - initWithUIntMax: (uintmax_t)uintmax; /** - * Initializes an already allocated OFNumber with the specified ptrdiff_t. + * \brief Initializes an already allocated OFNumber with the specified + * ptrdiff_t. * * \param ptrdiff A ptrdiff_t which the OFNumber should contain * \return An initialized OFNumber */ - initWithPtrDiff: (ptrdiff_t)ptrdiff; /** - * Initializes an already allocated OFNumber with the specified intptr_t. + * \brief Initializes an already allocated OFNumber with the specified intptr_t. * * \param intptr An intptr_t which the OFNumber should contain * \return An initialized OFNumber */ - initWithIntPtr: (intptr_t)intptr; /** - * Initializes an already allocated OFNumber with the specified uintptr_t. + * \brief Initializes an already allocated OFNumber with the specified + * uintptr_t. * * \param uintptr A uintptr_t which the OFNumber should contain * \return An initialized OFNumber */ - initWithUIntPtr: (uintptr_t)uintptr; /** - * Initializes an already allocated OFNumber with the specified float. + * \brief Initializes an already allocated OFNumber with the specified float. * * \param float_ A float which the OFNumber should contain * \return An initialized OFNumber */ - initWithFloat: (float)float_; /** - * Initializes an already allocated OFNumber with the specified double. + * \brief Initializes an already allocated OFNumber with the specified double. * * \param double_ A double which the OFNumber should contain * \return An initialized OFNumber */ - initWithDouble: (double)double_; /** + * \brief Returns the type of the number. + * * \return An of_number_type_t indicating the type of the number */ - (of_number_type_t)type; /** + * \brief Returns the OFNumber as a BOOL. + * * \return The OFNumber as a BOOL */ - (BOOL)boolValue; /** - * \return The OFNumber as a char + * \brief Returns the OFNumber as a signed char. + * + * \return The OFNumber as a signed char */ -- (char)charValue; +- (signed char)charValue; /** + * \brief Returns the OFNumber as a signed short. + * * \return The OFNumber as a short */ -- (short)shortValue; +- (signed short)shortValue; /** + * \brief Returns the OFNumber as a signed int. + * * \return The OFNumber as an int */ -- (int)intValue; +- (signed int)intValue; /** + * \brief Returns the OFNumber as a signed long. + * * \return The OFNumber as a long */ -- (long)longValue; +- (signed long)longValue; /** + * \brief Returns the OFNumber as an unsigned char. + * * \return The OFNumber as an unsigned char */ - (unsigned char)unsignedCharValue; /** + * \brief Returns the OFNumber as an unsigned short. + * * \return The OFNumber as an unsigned short */ - (unsigned short)unsignedShortValue; /** + * \brief Returns the OFNumber as an unsigned int. + * * \return The OFNumber as an unsigned int */ - (unsigned int)unsignedIntValue; /** + * \brief Returns the OFNumber as an unsigned long. + * * \return The OFNumber as an unsigned long */ - (unsigned long)unsignedLongValue; /** + * \brief Returns the OFNumber as an int8_t. + * * \return The OFNumber as an int8_t */ - (int8_t)int8Value; /** + * \brief Returns the OFNumber as an int16_t. + * * \return The OFNumber as an int16_t */ - (int16_t)int16Value; /** + * \brief Returns the OFNumber as an int32_t. + * * \return The OFNumber as an int32_t */ - (int32_t)int32Value; /** + * \brief Returns the OFNumber as an int64_t. + * * \return The OFNumber as an int64_t */ - (int64_t)int64Value; /** + * \brief Returns the OFNumber as a uint8_t. + * * \return The OFNumber as a uint8_t */ - (uint8_t)uInt8Value; /** + * \brief Returns the OFNumber as a uint16_t. + * * \return The OFNumber as a uint16_t */ - (uint16_t)uInt16Value; /** + * \brief Returns the OFNumber as a uint32_t. + * * \return The OFNumber as a uint32_t */ - (uint32_t)uInt32Value; /** + * \brief Returns the OFNumber as a uint64_t. + * * \return The OFNumber as a uint64_t */ - (uint64_t)uInt64Value; /** + * \brief Returns the OFNumber as a size_t. + * * \return The OFNumber as a size_t */ - (size_t)sizeValue; /** + * \brief Returns the OFNumber as an ssize_t. + * * \return The OFNumber as an ssize_t */ - (ssize_t)sSizeValue; /** + * \brief Returns the OFNumber as an intmax_t. + * * \return The OFNumber as an intmax_t */ - (intmax_t)intMaxValue; /** + * \brief Returns the OFNumber as a uintmax_t. + * * \return The OFNumber as a uintmax_t */ - (uintmax_t)uIntMaxValue; /** + * \brief Returns the OFNumber as a ptrdiff_t. + * * \return The OFNumber as a ptrdiff_t */ - (ptrdiff_t)ptrDiffValue; /** + * \brief Returns the OFNumber as an intptr_t. + * * \return The OFNumber as an intptr_t */ - (intptr_t)intPtrValue; /** + * \brief Returns the OFNumber as a uintptr_t. + * * \return The OFNumber as a uintptr_t */ - (uintptr_t)uIntPtrValue; /** + * \brief Returns the OFNumber as a float. + * * \return The OFNumber as a float */ - (float)floatValue; /** + * \brief Returns the OFNumber as a double. + * * \return The OFNumber as a double */ - (double)doubleValue; /** + * \brief Creates a new OFNumber by adding the specified number. + * * \param num The OFNumber to add * \return A new autoreleased OFNumber added with the specified OFNumber */ - (OFNumber*)numberByAddingNumber: (OFNumber*)num; /** + * \brief Creates a new OFNumber by subtracting the specified number. + * * \param num The OFNumber to substract * \return A new autoreleased OFNumber subtracted by the specified OFNumber */ - (OFNumber*)numberBySubtractingNumber: (OFNumber*)num; /** + * \brief Creates a new OFNumber by multiplying with the specified number. + * * \param num The OFNumber to multiply with * \return A new autoreleased OFNumber multiplied with the specified OFNumber */ - (OFNumber*)numberByMultiplyingWithNumber: (OFNumber*)num; /** + * \brief Creates a new OFNumber by dividing with with the specified number. + * * \param num The OFNumber to divide by * \return A new autoreleased OFNumber devided by the specified OFNumber */ - (OFNumber*)numberByDividingWithNumber: (OFNumber*)num; /** - * ANDs two OFNumbers, returning a new one. + * \brief Creates a new OFNumber by ANDing with the specified number. * * Does not work with floating point types! * * \param num The number to AND with. * \return A new autoreleased OFNumber ANDed with the specified OFNumber */ - (OFNumber*)numberByANDingWithNumber: (OFNumber*)num; /** - * ORs two OFNumbers, returning a new one. + * \brief Creates a new OFNumber by ORing with the specified number. * * Does not work with floating point types! * * \param num The number to OR with. * \return A new autoreleased OFNumber ORed with the specified OFNumber */ - (OFNumber*)numberByORingWithNumber: (OFNumber*)num; /** - * XORs two OFNumbers, returning a new one. + * \brief Creates a new OFNumber by XORing with the specified number. * * Does not work with floating point types! * * \param num The number to XOR with. * \return A new autoreleased OFNumber XORed with the specified OFNumber */ - (OFNumber*)numberByXORingWithNumber: (OFNumber*)num; /** - * Bitshifts the OFNumber to the left by the specified OFNumber, returning a new - * one. + * \brief Creates a new OFNumber by shifting to the left by the specified number + * of bits. * * Does not work with floating point types! * * \param num The number of bits to shift to the left * \return A new autoreleased OFNumber bitshifted to the left with the @@ -650,12 +775,12 @@ * specified OFNumber */ - (OFNumber*)numberByShiftingLeftWithNumber: (OFNumber*)num; /** - * Bitshifts the OFNumber to the right by the specified OFNumber, returning a - * new one. + * \brief Creates a new OFNumber by shifting to the right by the specified + * number of bits. * * Does not work with floating point types! * * \param num The number of bits to shift to the right * \return A new autoreleased OFNumber bitshifted to the right with the @@ -662,20 +787,27 @@ * specified OFNumber */ - (OFNumber*)numberByShiftingRightWithNumber: (OFNumber*)num; /** + * \brief Creates a new OFNumber by with the same value increased by one. + * * \return A new autoreleased OFNumber with the value increased by one. */ - (OFNumber*)numberByIncreasing; /** + * \brief Creates a new OFNumber by with the same value decreased by one. + * * \return A new autoreleased OFNumber with the value decreased by one. */ - (OFNumber*)numberByDecreasing; /** + * \brief Creates a new OFNumber with the remainder of a division with the + * specified number. + * * \param num The number to divide by * \return The remainder of a division by the specified number */ - (OFNumber*)remainderOfDivisionWithNumber: (OFNumber*)num; @end Index: src/OFNumber.m ================================================================== --- src/OFNumber.m +++ src/OFNumber.m @@ -312,26 +312,26 @@ + numberWithBool: (BOOL)bool_ { return [[[self alloc] initWithBool: bool_] autorelease]; } -+ numberWithChar: (char)char_ ++ numberWithChar: (signed char)char_ { return [[[self alloc] initWithChar: char_] autorelease]; } -+ numberWithShort: (short)short_ ++ numberWithShort: (signed short)short_ { return [[[self alloc] initWithShort: short_] autorelease]; } -+ numberWithInt: (int)int_ ++ numberWithInt: (signed int)int_ { return [[[self alloc] initWithInt: int_] autorelease]; } -+ numberWithLong: (long)long_ ++ numberWithLong: (signed long)long_ { return [[[self alloc] initWithLong: long_] autorelease]; } + numberWithUnsignedChar: (unsigned char)uchar @@ -453,41 +453,41 @@ type = OF_NUMBER_BOOL; return self; } -- initWithChar: (char)char_ +- initWithChar: (signed char)char_ { self = [super init]; value.char_ = char_; type = OF_NUMBER_CHAR; return self; } -- initWithShort: (short)short_ +- initWithShort: (signed short)short_ { self = [super init]; value.short_ = short_; type = OF_NUMBER_SHORT; return self; } -- initWithInt: (int)int_ +- initWithInt: (signed int)int_ { self = [super init]; value.int_ = int_; type = OF_NUMBER_INT; return self; } -- initWithLong: (long)long_ +- initWithLong: (signed long)long_ { self = [super init]; value.long_ = long_; type = OF_NUMBER_LONG; @@ -713,28 +713,28 @@ - (BOOL)boolValue { RETURN_AS(BOOL) } -- (char)charValue -{ - RETURN_AS(char) -} - -- (short)shortValue -{ - RETURN_AS(short) -} - -- (int)intValue -{ - RETURN_AS(int) -} - -- (long)longValue -{ - RETURN_AS(long) +- (signed char)charValue +{ + RETURN_AS(signed char) +} + +- (signed short)shortValue +{ + RETURN_AS(signed short) +} + +- (signed int)intValue +{ + RETURN_AS(signed int) +} + +- (signed long)longValue +{ + RETURN_AS(signed long) } - (unsigned char)unsignedCharValue { RETURN_AS(unsigned char) @@ -838,14 +838,18 @@ - (double)doubleValue { RETURN_AS(double) } -- (BOOL)isEqual: (id)obj +- (BOOL)isEqual: (id)object { - if (![obj isKindOfClass: [OFNumber class]]) + OFNumber *number; + + if (![object isKindOfClass: [OFNumber class]]) return NO; + + number = object; switch (type) { case OF_NUMBER_CHAR: case OF_NUMBER_SHORT: case OF_NUMBER_INT: @@ -854,11 +858,11 @@ case OF_NUMBER_INT16: case OF_NUMBER_INT32: case OF_NUMBER_INT64: case OF_NUMBER_INTMAX: case OF_NUMBER_PTRDIFF: - return ([(OFNumber*)obj intMaxValue] == [self intMaxValue]); + return ([number intMaxValue] == [self intMaxValue]); case OF_NUMBER_SSIZE: case OF_NUMBER_UCHAR: case OF_NUMBER_USHORT: case OF_NUMBER_UINT: case OF_NUMBER_ULONG: @@ -868,14 +872,14 @@ case OF_NUMBER_UINT64: case OF_NUMBER_SIZE: case OF_NUMBER_UINTMAX: case OF_NUMBER_INTPTR: case OF_NUMBER_UINTPTR: - return ([(OFNumber*)obj uIntMaxValue] == [self uIntMaxValue]); + return ([number uIntMaxValue] == [self uIntMaxValue]); case OF_NUMBER_FLOAT: case OF_NUMBER_DOUBLE: - return ([(OFNumber*)obj doubleValue] == [self doubleValue]); + return ([number doubleValue] == [self doubleValue]); default: return NO; } } @@ -957,88 +961,88 @@ - (OFNumber*)numberByDecreasing { CALCULATE3(- 1) } -- (OFNumber*)remainderOfDivisionWithNumber: (OFNumber*)num +- (OFNumber*)remainderOfDivisionWithNumber: (OFNumber*)number { switch (type) { case OF_NUMBER_BOOL: - return [OFNumber numberWithBool: value.bool_ % [num boolValue]]; + return [OFNumber numberWithBool: value.bool_ % [number boolValue]]; case OF_NUMBER_CHAR: - return [OFNumber numberWithChar: value.char_ % [num charValue]]; + return [OFNumber numberWithChar: value.char_ % [number charValue]]; case OF_NUMBER_SHORT: return [OFNumber numberWithShort: - value.short_ % [num shortValue]]; + value.short_ % [number shortValue]]; case OF_NUMBER_INT: - return [OFNumber numberWithInt: value.int_ % [num intValue]]; + return [OFNumber numberWithInt: value.int_ % [number intValue]]; case OF_NUMBER_LONG: return [OFNumber numberWithLong: - value.long_ % [num longValue]]; + value.long_ % [number longValue]]; case OF_NUMBER_UCHAR: return [OFNumber numberWithUnsignedChar: - value.uchar % [num unsignedCharValue]]; + value.uchar % [number unsignedCharValue]]; case OF_NUMBER_USHORT: return [OFNumber numberWithUnsignedShort: - value.ushort % [num unsignedShortValue]]; + value.ushort % [number unsignedShortValue]]; case OF_NUMBER_UINT: return [OFNumber numberWithUnsignedInt: - value.uint % [num unsignedIntValue]]; + value.uint % [number unsignedIntValue]]; case OF_NUMBER_ULONG: return [OFNumber numberWithUnsignedLong: - value.ulong % [num unsignedLongValue]]; + value.ulong % [number unsignedLongValue]]; case OF_NUMBER_INT8: return [OFNumber numberWithInt8: - value.int8 % [num int8Value]]; + value.int8 % [number int8Value]]; case OF_NUMBER_INT16: return [OFNumber numberWithInt16: - value.int16 % [num int16Value]]; + value.int16 % [number int16Value]]; case OF_NUMBER_INT32: return [OFNumber numberWithInt32: - value.int32 % [num int32Value]]; + value.int32 % [number int32Value]]; case OF_NUMBER_INT64: return [OFNumber numberWithInt64: - value.int64 % [num int64Value]]; + value.int64 % [number int64Value]]; case OF_NUMBER_UINT8: return [OFNumber numberWithUInt8: - value.uint8 % [num uInt8Value]]; + value.uint8 % [number uInt8Value]]; case OF_NUMBER_UINT16: return [OFNumber numberWithUInt16: - value.uint16 % [num uInt16Value]]; + value.uint16 % [number uInt16Value]]; case OF_NUMBER_UINT32: return [OFNumber numberWithUInt32: - value.uint32 % [num uInt32Value]]; + value.uint32 % [number uInt32Value]]; case OF_NUMBER_UINT64: return [OFNumber numberWithUInt64: - value.uint64 % [num uInt64Value]]; + value.uint64 % [number uInt64Value]]; case OF_NUMBER_SIZE: return [OFNumber numberWithSize: - value.size % [num sizeValue]]; + value.size % [number sizeValue]]; case OF_NUMBER_SSIZE: return [OFNumber numberWithSSize: - value.ssize % [num sSizeValue]]; + value.ssize % [number sSizeValue]]; case OF_NUMBER_INTMAX: return [OFNumber numberWithIntMax: - value.intmax % [num intMaxValue]]; + value.intmax % [number intMaxValue]]; case OF_NUMBER_UINTMAX: return [OFNumber numberWithUIntMax: - value.uintmax % [num uIntMaxValue]]; + value.uintmax % [number uIntMaxValue]]; case OF_NUMBER_PTRDIFF: return [OFNumber numberWithPtrDiff: - value.ptrdiff % [num ptrDiffValue]]; + value.ptrdiff % [number ptrDiffValue]]; case OF_NUMBER_INTPTR: return [OFNumber numberWithIntPtr: - value.intptr % [num intPtrValue]]; + value.intptr % [number intPtrValue]]; case OF_NUMBER_UINTPTR: return [OFNumber numberWithUIntPtr: - value.uintptr % [num uIntPtrValue]]; + value.uintptr % [number uIntPtrValue]]; case OF_NUMBER_FLOAT: return [OFNumber - numberWithFloat: fmodf(value.float_, [num floatValue])]; + numberWithFloat: fmodf(value.float_, [number floatValue])]; case OF_NUMBER_DOUBLE: - return [OFNumber - numberWithDouble: fmod(value.double_, [num doubleValue])]; + return [OFNumber numberWithDouble: + fmod(value.double_, [number doubleValue])]; default: @throw [OFInvalidFormatException newWithClass: isa]; } }