Overview
Comment: | OFNumber: Add long long. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
fd8c1728eaff12475e851683acc2b908 |
User & Date: | js on 2013-02-26 18:40:53 |
Other Links: | manifest | tags |
Context
2013-02-28
| ||
09:57 | Make @true and @false work. check-in: de24e36b29 user: js tags: trunk | |
2013-02-26
| ||
18:40 | OFNumber: Add long long. check-in: fd8c1728ea user: js tags: trunk | |
2013-02-24
| ||
11:17 | Fix includes of ObjFW-Bridge. check-in: 1ccdae4fd6 user: js tags: trunk | |
Changes
Modified src/OFNumber.h from [4db74b4fc5] to [afb39b7429].
︙ | ︙ | |||
40 41 42 43 44 45 46 47 | OF_NUMBER_UCHAR = 0x02, /*! unsigned short */ OF_NUMBER_USHORT = 0x03, /*! unsigned int */ OF_NUMBER_UINT = 0x04, /*! unsigned long */ OF_NUMBER_ULONG = 0x05, /*! size_t */ | > > | | | | | | | > > | | | | | | | > | | | | > | | | | | | | | | | | | | | | | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | OF_NUMBER_UCHAR = 0x02, /*! unsigned short */ OF_NUMBER_USHORT = 0x03, /*! unsigned int */ OF_NUMBER_UINT = 0x04, /*! unsigned long */ OF_NUMBER_ULONG = 0x05, /*! unsigned long long */ OF_NUMBER_ULONGLONG = 0x06, /*! size_t */ OF_NUMBER_SIZE = 0x07, /*! uint8_t */ OF_NUMBER_UINT8 = 0x08, /*! uint16_t */ OF_NUMBER_UINT16 = 0x09, /*! uint32_t */ OF_NUMBER_UINT32 = 0x0A, /*! uint64_t */ OF_NUMBER_UINT64 = 0x0B, /*! uintptr_t */ OF_NUMBER_UINTPTR = 0x0C, /*! uintmax_t */ OF_NUMBER_UINTMAX = 0x0D, OF_NUMBER_SIGNED = 0x10, /*! signed char */ OF_NUMBER_CHAR = OF_NUMBER_UCHAR | OF_NUMBER_SIGNED, /*! signed short */ OF_NUMBER_SHORT = OF_NUMBER_USHORT | OF_NUMBER_SIGNED, /*! signed int */ OF_NUMBER_INT = OF_NUMBER_UINT | OF_NUMBER_SIGNED, /*! signed long */ OF_NUMBER_LONG = OF_NUMBER_ULONG | OF_NUMBER_SIGNED, /*! signed long long */ OF_NUMBER_LONGLONG = OF_NUMBER_ULONGLONG | OF_NUMBER_SIGNED, /*! int8_t */ OF_NUMBER_INT8 = OF_NUMBER_UINT8 | OF_NUMBER_SIGNED, /*! int16_t */ OF_NUMBER_INT16 = OF_NUMBER_UINT16 | OF_NUMBER_SIGNED, /*! int32_t */ OF_NUMBER_INT32 = OF_NUMBER_UINT32 | OF_NUMBER_SIGNED, /*! int64_t */ OF_NUMBER_INT64 = OF_NUMBER_UINT64 | OF_NUMBER_SIGNED, /*! ssize_t */ OF_NUMBER_SSIZE = OF_NUMBER_SIZE | OF_NUMBER_SIGNED, /*! intmax_t */ OF_NUMBER_INTMAX = OF_NUMBER_UINTMAX | OF_NUMBER_SIGNED, /*! ptrdiff_t */ OF_NUMBER_PTRDIFF = 0x0E | OF_NUMBER_SIGNED, /*! intptr_t */ OF_NUMBER_INTPTR = 0x0F | OF_NUMBER_SIGNED, /*! float */ OF_NUMBER_FLOAT = 0x20, /*! double */ OF_NUMBER_DOUBLE = 0x40 | OF_NUMBER_FLOAT, } of_number_type_t; /*! * @brief Provides a way to store a number in an object. */ @interface OFNumber: OFObject <OFCopying, OFComparing, OFSerialization, OFJSONRepresentation, OFBinaryPackRepresentation> { union of_number_value { BOOL bool_; signed char schar; signed short sshort; signed int sint; signed long slong; signed long long slonglong; unsigned char uchar; unsigned short ushort; unsigned int uint; unsigned long ulong; unsigned long long ulonglong; int8_t int8; int16_t int16; int32_t int32; int64_t int64; uint8_t uint8; uint16_t uint16; uint32_t uint32; uint64_t uint64; size_t size; ssize_t ssize; intmax_t intmax; uintmax_t uintmax; ptrdiff_t ptrdiff; intptr_t intptr; uintptr_t uintptr; float float_; double double_; } _value; of_number_type_t _type; } #ifdef OF_HAVE_PROPERTIES @property (readonly) of_number_type_t type; #endif |
︙ | ︙ | |||
166 167 168 169 170 171 172 173 174 175 176 177 178 179 | * @brief Creates a new OFNumber with the specified signed long. * * @param slong A signed long which the OFNumber should contain * @return A new autoreleased OFNumber */ + (instancetype)numberWithLong: (signed long)slong; /*! * @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 */ + (instancetype)numberWithUnsignedChar: (unsigned char)uchar; | > > > > > > > > | 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 | * @brief Creates a new OFNumber with the specified signed long. * * @param slong A signed long which the OFNumber should contain * @return A new autoreleased OFNumber */ + (instancetype)numberWithLong: (signed long)slong; /*! * @brief Creates a new OFNumber with the specified signed long long. * * @param slonglong A signed long long which the OFNumber should contain * @return A new autoreleased OFNumber */ + (instancetype)numberWithLongLong: (signed long long)slonglong; /*! * @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 */ + (instancetype)numberWithUnsignedChar: (unsigned char)uchar; |
︙ | ︙ | |||
198 199 200 201 202 203 204 205 206 207 208 209 210 211 | * @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 */ + (instancetype)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 */ + (instancetype)numberWithInt8: (int8_t)int8; | > > > > > > > > | 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 | * @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 */ + (instancetype)numberWithUnsignedLong: (unsigned long)ulong; /*! * @brief Creates a new OFNumber with the specified unsigned long long. * * @param ulonglong An unsigned long long which the OFNumber should contain * @return A new autoreleased OFNumber */ + (instancetype)numberWithUnsignedLongLong: (unsigned long long)ulonglong; /*! * @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 */ + (instancetype)numberWithInt8: (int8_t)int8; |
︙ | ︙ | |||
378 379 380 381 382 383 384 385 386 387 388 389 390 391 | * long. * * @param slong A signed long which the OFNumber should contain * @return An initialized OFNumber */ - initWithLong: (signed long)slong; /*! * @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 */ | > > > > > > > > > | 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 | * long. * * @param slong A signed long which the OFNumber should contain * @return An initialized OFNumber */ - initWithLong: (signed long)slong; /*! * @brief Initializes an already allocated OFNumber with the specified signed * long long. * * @param slonglong A signed long long which the OFNumber should contain * @return An initialized OFNumber */ - initWithLongLong: (signed long long)slonglong; /*! * @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 */ |
︙ | ︙ | |||
414 415 416 417 418 419 420 421 422 423 424 425 426 427 | * long. * * @param ulong An unsigned long which the OFNumber should contain * @return An initialized OFNumber */ - initWithUnsignedLong: (unsigned long)ulong; /*! * @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; | > > > > > > > > > | 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 | * long. * * @param ulong An unsigned long which the OFNumber should contain * @return An initialized OFNumber */ - initWithUnsignedLong: (unsigned long)ulong; /*! * @brief Initializes an already allocated OFNumber with the specified unsigned * long long. * * @param ulonglong An unsigned long long which the OFNumber should contain * @return An initialized OFNumber */ - initWithUnsignedLongLong: (unsigned long long)ulonglong; /*! * @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; |
︙ | ︙ | |||
577 578 579 580 581 582 583 | * @return The OFNumber as a signed char */ - (signed char)charValue; /*! * @brief Returns the OFNumber as a signed short. * | | | | > > > > > > > | 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 | * @return The OFNumber as a signed char */ - (signed char)charValue; /*! * @brief Returns the OFNumber as a signed short. * * @return The OFNumber as a signed short */ - (signed short)shortValue; /*! * @brief Returns the OFNumber as a signed int. * * @return The OFNumber as a signed int */ - (signed int)intValue; /*! * @brief Returns the OFNumber as a signed long. * * @return The OFNumber as a signed long */ - (signed long)longValue; /*! * @brief Returns the OFNumber as a signed long long. * * @return The OFNumber as a signed long long */ - (signed long long)longLongValue; /*! * @brief Returns the OFNumber as an unsigned char. * * @return The OFNumber as an unsigned char */ - (unsigned char)unsignedCharValue; |
︙ | ︙ | |||
623 624 625 626 627 628 629 630 631 632 633 634 635 636 | /*! * @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; | > > > > > > > | 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 | /*! * @brief Returns the OFNumber as an unsigned long. * * @return The OFNumber as an unsigned long */ - (unsigned long)unsignedLongValue; /*! * @brief Returns the OFNumber as an unsigned long long. * * @return The OFNumber as an unsigned long long */ - (unsigned long long)unsignedLongLongValue; /*! * @brief Returns the OFNumber as an int8_t. * * @return The OFNumber as an int8_t */ - (int8_t)int8Value; |
︙ | ︙ |
Modified src/OFNumber.m from [c8342b8a79] to [c13a2ddb4a].
︙ | ︙ | |||
41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | return (t)_value.schar; \ case OF_NUMBER_SHORT: \ return (t)_value.sshort; \ case OF_NUMBER_INT: \ return (t)_value.sint; \ case OF_NUMBER_LONG: \ return (t)_value.slong; \ case OF_NUMBER_UCHAR: \ return (t)_value.uchar; \ case OF_NUMBER_USHORT: \ return (t)_value.ushort; \ case OF_NUMBER_UINT: \ return (t)_value.uint; \ case OF_NUMBER_ULONG: \ return (t)_value.ulong; \ case OF_NUMBER_INT8: \ return (t)_value.int8; \ case OF_NUMBER_INT16: \ return (t)_value.int16; \ case OF_NUMBER_INT32: \ return (t)_value.int32; \ case OF_NUMBER_INT64: \ | > > > > | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | return (t)_value.schar; \ case OF_NUMBER_SHORT: \ return (t)_value.sshort; \ case OF_NUMBER_INT: \ return (t)_value.sint; \ case OF_NUMBER_LONG: \ return (t)_value.slong; \ case OF_NUMBER_LONGLONG: \ return (t)_value.slonglong; \ case OF_NUMBER_UCHAR: \ return (t)_value.uchar; \ case OF_NUMBER_USHORT: \ return (t)_value.ushort; \ case OF_NUMBER_UINT: \ return (t)_value.uint; \ case OF_NUMBER_ULONG: \ return (t)_value.ulong; \ case OF_NUMBER_ULONGLONG: \ return (t)_value.ulonglong; \ case OF_NUMBER_INT8: \ return (t)_value.int8; \ case OF_NUMBER_INT16: \ return (t)_value.int16; \ case OF_NUMBER_INT32: \ return (t)_value.int32; \ case OF_NUMBER_INT64: \ |
︙ | ︙ | |||
104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 | _value.sshort o [n shortValue]]; \ case OF_NUMBER_INT: \ return [OFNumber numberWithInt: \ _value.sint o [n intValue]]; \ case OF_NUMBER_LONG: \ return [OFNumber numberWithLong: \ _value.slong o [n longValue]]; \ case OF_NUMBER_UCHAR: \ return [OFNumber numberWithUnsignedChar: \ _value.uchar o [n unsignedCharValue]]; \ case OF_NUMBER_USHORT: \ return [OFNumber numberWithUnsignedShort: \ _value.ushort o [n unsignedShortValue]]; \ case OF_NUMBER_UINT: \ return [OFNumber numberWithUnsignedInt: \ _value.uint o [n unsignedIntValue]]; \ case OF_NUMBER_ULONG: \ return [OFNumber numberWithUnsignedLong: \ _value.ulong o [n unsignedLongValue]]; \ case OF_NUMBER_INT8: \ return [OFNumber numberWithInt8: \ _value.int8 o [n int8Value]]; \ case OF_NUMBER_INT16: \ return [OFNumber numberWithInt16: \ _value.int16 o [n int16Value]]; \ case OF_NUMBER_INT32: \ | > > > > > > | 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 | _value.sshort o [n shortValue]]; \ case OF_NUMBER_INT: \ return [OFNumber numberWithInt: \ _value.sint o [n intValue]]; \ case OF_NUMBER_LONG: \ return [OFNumber numberWithLong: \ _value.slong o [n longValue]]; \ case OF_NUMBER_LONGLONG: \ return [OFNumber numberWithLongLong: \ _value.slonglong o [n longLongValue]]; \ case OF_NUMBER_UCHAR: \ return [OFNumber numberWithUnsignedChar: \ _value.uchar o [n unsignedCharValue]]; \ case OF_NUMBER_USHORT: \ return [OFNumber numberWithUnsignedShort: \ _value.ushort o [n unsignedShortValue]]; \ case OF_NUMBER_UINT: \ return [OFNumber numberWithUnsignedInt: \ _value.uint o [n unsignedIntValue]]; \ case OF_NUMBER_ULONG: \ return [OFNumber numberWithUnsignedLong: \ _value.ulong o [n unsignedLongValue]]; \ case OF_NUMBER_ULONGLONG: \ return [OFNumber numberWithUnsignedLongLong: \ _value.ulonglong o [n unsignedLongLongValue]]; \ case OF_NUMBER_INT8: \ return [OFNumber numberWithInt8: \ _value.int8 o [n int8Value]]; \ case OF_NUMBER_INT16: \ return [OFNumber numberWithInt16: \ _value.int16 o [n int16Value]]; \ case OF_NUMBER_INT32: \ |
︙ | ︙ | |||
188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 | _value.sshort o [n shortValue]]; \ case OF_NUMBER_INT: \ return [OFNumber numberWithInt: \ _value.sint o [n intValue]]; \ case OF_NUMBER_LONG: \ return [OFNumber numberWithLong: \ _value.slong o [n longValue]]; \ case OF_NUMBER_UCHAR: \ return [OFNumber numberWithUnsignedChar: \ _value.uchar o [n unsignedCharValue]]; \ case OF_NUMBER_USHORT: \ return [OFNumber numberWithUnsignedShort: \ _value.ushort o [n unsignedShortValue]]; \ case OF_NUMBER_UINT: \ return [OFNumber numberWithUnsignedInt: \ _value.uint o [n unsignedIntValue]]; \ case OF_NUMBER_ULONG: \ return [OFNumber numberWithUnsignedLong: \ _value.ulong o [n unsignedLongValue]]; \ case OF_NUMBER_INT8: \ return [OFNumber numberWithInt8: \ _value.int8 o [n int8Value]]; \ case OF_NUMBER_INT16: \ return [OFNumber numberWithInt16: \ _value.int16 o [n int16Value]]; \ case OF_NUMBER_INT32: \ | > > > > > > | 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 | _value.sshort o [n shortValue]]; \ case OF_NUMBER_INT: \ return [OFNumber numberWithInt: \ _value.sint o [n intValue]]; \ case OF_NUMBER_LONG: \ return [OFNumber numberWithLong: \ _value.slong o [n longValue]]; \ case OF_NUMBER_LONGLONG: \ return [OFNumber numberWithLongLong: \ _value.slonglong o [n longLongValue]]; \ case OF_NUMBER_UCHAR: \ return [OFNumber numberWithUnsignedChar: \ _value.uchar o [n unsignedCharValue]]; \ case OF_NUMBER_USHORT: \ return [OFNumber numberWithUnsignedShort: \ _value.ushort o [n unsignedShortValue]]; \ case OF_NUMBER_UINT: \ return [OFNumber numberWithUnsignedInt: \ _value.uint o [n unsignedIntValue]]; \ case OF_NUMBER_ULONG: \ return [OFNumber numberWithUnsignedLong: \ _value.ulong o [n unsignedLongValue]]; \ case OF_NUMBER_ULONGLONG: \ return [OFNumber numberWithUnsignedLongLong: \ _value.ulonglong o [n unsignedLongLongValue]]; \ case OF_NUMBER_INT8: \ return [OFNumber numberWithInt8: \ _value.int8 o [n int8Value]]; \ case OF_NUMBER_INT16: \ return [OFNumber numberWithInt16: \ _value.int16 o [n int16Value]]; \ case OF_NUMBER_INT32: \ |
︙ | ︙ | |||
266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 | return [OFNumber numberWithChar: _value.schar o]; \ case OF_NUMBER_SHORT: \ return [OFNumber numberWithShort: _value.sshort o]; \ case OF_NUMBER_INT: \ return [OFNumber numberWithInt: _value.sint o]; \ case OF_NUMBER_LONG: \ return [OFNumber numberWithLong: _value.slong o]; \ case OF_NUMBER_UCHAR: \ return [OFNumber numberWithUnsignedChar: \ _value.uchar o]; \ case OF_NUMBER_USHORT: \ return [OFNumber numberWithUnsignedShort: \ _value.ushort o]; \ case OF_NUMBER_UINT: \ return [OFNumber numberWithUnsignedInt: _value.uint o]; \ case OF_NUMBER_ULONG: \ return [OFNumber numberWithUnsignedLong: \ | > > > | > > > | 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 | return [OFNumber numberWithChar: _value.schar o]; \ case OF_NUMBER_SHORT: \ return [OFNumber numberWithShort: _value.sshort o]; \ case OF_NUMBER_INT: \ return [OFNumber numberWithInt: _value.sint o]; \ case OF_NUMBER_LONG: \ return [OFNumber numberWithLong: _value.slong o]; \ case OF_NUMBER_LONGLONG: \ return [OFNumber numberWithLongLong: \ _value.slonglong o]; \ case OF_NUMBER_UCHAR: \ return [OFNumber numberWithUnsignedChar: \ _value.uchar o]; \ case OF_NUMBER_USHORT: \ return [OFNumber numberWithUnsignedShort: \ _value.ushort o]; \ case OF_NUMBER_UINT: \ return [OFNumber numberWithUnsignedInt: _value.uint o]; \ case OF_NUMBER_ULONG: \ return [OFNumber numberWithUnsignedLong: \ _value.ulong o]; \ case OF_NUMBER_ULONGLONG: \ return [OFNumber numberWithUnsignedLongLong: \ _value.ulonglong o]; \ case OF_NUMBER_INT8: \ return [OFNumber numberWithInt8: _value.int8 o]; \ case OF_NUMBER_INT16: \ return [OFNumber numberWithInt16: _value.int16 o]; \ case OF_NUMBER_INT32: \ return [OFNumber numberWithInt32: _value.int32 o]; \ case OF_NUMBER_INT64: \ |
︙ | ︙ | |||
341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 | return [[[self alloc] initWithInt: sint] autorelease]; } + (instancetype)numberWithLong: (signed long)slong { return [[[self alloc] initWithLong: slong] autorelease]; } + (instancetype)numberWithUnsignedChar: (unsigned char)uchar { return [[[self alloc] initWithUnsignedChar: uchar] autorelease]; } + (instancetype)numberWithUnsignedShort: (unsigned short)ushort { return [[[self alloc] initWithUnsignedShort: ushort] autorelease]; } + (instancetype)numberWithUnsignedInt: (unsigned int)uint { return [[[self alloc] initWithUnsignedInt: uint] autorelease]; } + (instancetype)numberWithUnsignedLong: (unsigned long)ulong { return [[[self alloc] initWithUnsignedLong: ulong] autorelease]; } + (instancetype)numberWithInt8: (int8_t)int8 { return [[[self alloc] initWithInt8: int8] autorelease]; } + (instancetype)numberWithInt16: (int16_t)int16 | > > > > > > > > > > | 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 | return [[[self alloc] initWithInt: sint] autorelease]; } + (instancetype)numberWithLong: (signed long)slong { return [[[self alloc] initWithLong: slong] autorelease]; } + (instancetype)numberWithLongLong: (signed long long)slonglong { return [[[self alloc] initWithLongLong: slonglong] autorelease]; } + (instancetype)numberWithUnsignedChar: (unsigned char)uchar { return [[[self alloc] initWithUnsignedChar: uchar] autorelease]; } + (instancetype)numberWithUnsignedShort: (unsigned short)ushort { return [[[self alloc] initWithUnsignedShort: ushort] autorelease]; } + (instancetype)numberWithUnsignedInt: (unsigned int)uint { return [[[self alloc] initWithUnsignedInt: uint] autorelease]; } + (instancetype)numberWithUnsignedLong: (unsigned long)ulong { return [[[self alloc] initWithUnsignedLong: ulong] autorelease]; } + (instancetype)numberWithUnsignedLongLong: (unsigned long long)ulonglong { return [[[self alloc] initWithUnsignedLongLong: ulonglong] autorelease]; } + (instancetype)numberWithInt8: (int8_t)int8 { return [[[self alloc] initWithInt8: int8] autorelease]; } + (instancetype)numberWithInt16: (int16_t)int16 |
︙ | ︙ | |||
508 509 510 511 512 513 514 515 516 517 518 519 520 521 | self = [super init]; _value.slong = slong; _type = OF_NUMBER_LONG; return self; } - initWithUnsignedChar: (unsigned char)uchar { self = [super init]; _value.uchar = uchar; _type = OF_NUMBER_UCHAR; | > > > > > > > > > > | 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 | self = [super init]; _value.slong = slong; _type = OF_NUMBER_LONG; return self; } - initWithLongLong: (signed long long)slonglong { self = [super init]; _value.slonglong = slonglong; _type = OF_NUMBER_LONGLONG; return self; } - initWithUnsignedChar: (unsigned char)uchar { self = [super init]; _value.uchar = uchar; _type = OF_NUMBER_UCHAR; |
︙ | ︙ | |||
546 547 548 549 550 551 552 553 554 555 556 557 558 559 | - initWithUnsignedLong: (unsigned long)ulong { self = [super init]; _value.ulong = ulong; _type = OF_NUMBER_ULONG; return self; } - initWithInt8: (int8_t)int8 { self = [super init]; | > > > > > > > > > > | 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 | - initWithUnsignedLong: (unsigned long)ulong { self = [super init]; _value.ulong = ulong; _type = OF_NUMBER_ULONG; return self; } - initWithUnsignedLongLong: (unsigned long long)ulonglong { self = [super init]; _value.ulonglong = ulonglong; _type = OF_NUMBER_ULONGLONG; return self; } - initWithInt8: (int8_t)int8 { self = [super init]; |
︙ | ︙ | |||
808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 | return !!_value.schar; case OF_NUMBER_SHORT: return !!_value.sshort; case OF_NUMBER_INT: return !!_value.sint; case OF_NUMBER_LONG: return !!_value.slong; case OF_NUMBER_UCHAR: return !!_value.uchar; case OF_NUMBER_USHORT: return !!_value.ushort; case OF_NUMBER_UINT: return !!_value.uint; case OF_NUMBER_ULONG: return !!_value.ulong; case OF_NUMBER_INT8: return !!_value.int8; case OF_NUMBER_INT16: return !!_value.int16; case OF_NUMBER_INT32: return !!_value.int32; case OF_NUMBER_INT64: | > > > > | 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 | return !!_value.schar; case OF_NUMBER_SHORT: return !!_value.sshort; case OF_NUMBER_INT: return !!_value.sint; case OF_NUMBER_LONG: return !!_value.slong; case OF_NUMBER_LONGLONG: return !!_value.slonglong; case OF_NUMBER_UCHAR: return !!_value.uchar; case OF_NUMBER_USHORT: return !!_value.ushort; case OF_NUMBER_UINT: return !!_value.uint; case OF_NUMBER_ULONG: return !!_value.ulong; case OF_NUMBER_ULONGLONG: return !!_value.ulonglong; case OF_NUMBER_INT8: return !!_value.int8; case OF_NUMBER_INT16: return !!_value.int16; case OF_NUMBER_INT32: return !!_value.int32; case OF_NUMBER_INT64: |
︙ | ︙ | |||
875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 | RETURN_AS(signed int) } - (signed long)longValue { RETURN_AS(signed long) } - (unsigned char)unsignedCharValue { RETURN_AS(unsigned char) } - (unsigned short)unsignedShortValue { RETURN_AS(unsigned short) } - (unsigned int)unsignedIntValue { RETURN_AS(unsigned int) } - (unsigned long)unsignedLongValue { RETURN_AS(unsigned long) } - (int8_t)int8Value { RETURN_AS(int8_t) } - (int16_t)int16Value | > > > > > > > > > > | 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 | RETURN_AS(signed int) } - (signed long)longValue { RETURN_AS(signed long) } - (signed long long)longLongValue { RETURN_AS(signed long long) } - (unsigned char)unsignedCharValue { RETURN_AS(unsigned char) } - (unsigned short)unsignedShortValue { RETURN_AS(unsigned short) } - (unsigned int)unsignedIntValue { RETURN_AS(unsigned int) } - (unsigned long)unsignedLongValue { RETURN_AS(unsigned long) } - (unsigned long long)unsignedLongLongValue { RETURN_AS(unsigned long long) } - (int8_t)int8Value { RETURN_AS(int8_t) } - (int16_t)int16Value |
︙ | ︙ | |||
1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 | _value.sshort % [number shortValue]]; case OF_NUMBER_INT: return [OFNumber numberWithInt: _value.sint % [number intValue]]; case OF_NUMBER_LONG: return [OFNumber numberWithLong: _value.slong % [number longValue]]; case OF_NUMBER_UCHAR: return [OFNumber numberWithUnsignedChar: _value.uchar % [number unsignedCharValue]]; case OF_NUMBER_USHORT: return [OFNumber numberWithUnsignedShort: _value.ushort % [number unsignedShortValue]]; case OF_NUMBER_UINT: return [OFNumber numberWithUnsignedInt: _value.uint % [number unsignedIntValue]]; case OF_NUMBER_ULONG: return [OFNumber numberWithUnsignedLong: _value.ulong % [number unsignedLongValue]]; case OF_NUMBER_INT8: return [OFNumber numberWithInt8: _value.int8 % [number int8Value]]; case OF_NUMBER_INT16: return [OFNumber numberWithInt16: _value.int16 % [number int16Value]]; case OF_NUMBER_INT32: | > > > > > > | 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 | _value.sshort % [number shortValue]]; case OF_NUMBER_INT: return [OFNumber numberWithInt: _value.sint % [number intValue]]; case OF_NUMBER_LONG: return [OFNumber numberWithLong: _value.slong % [number longValue]]; case OF_NUMBER_LONGLONG: return [OFNumber numberWithLongLong: _value.slonglong % [number longLongValue]]; case OF_NUMBER_UCHAR: return [OFNumber numberWithUnsignedChar: _value.uchar % [number unsignedCharValue]]; case OF_NUMBER_USHORT: return [OFNumber numberWithUnsignedShort: _value.ushort % [number unsignedShortValue]]; case OF_NUMBER_UINT: return [OFNumber numberWithUnsignedInt: _value.uint % [number unsignedIntValue]]; case OF_NUMBER_ULONG: return [OFNumber numberWithUnsignedLong: _value.ulong % [number unsignedLongValue]]; case OF_NUMBER_ULONGLONG: return [OFNumber numberWithUnsignedLongLong: _value.ulonglong % [number unsignedLongLongValue]]; case OF_NUMBER_INT8: return [OFNumber numberWithInt8: _value.int8 % [number int8Value]]; case OF_NUMBER_INT16: return [OFNumber numberWithInt16: _value.int16 % [number int16Value]]; case OF_NUMBER_INT32: |
︙ | ︙ | |||
1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 | switch (_type) { case OF_NUMBER_BOOL: return (_value.bool_ ? @"YES" : @"NO"); case OF_NUMBER_UCHAR: case OF_NUMBER_USHORT: case OF_NUMBER_UINT: case OF_NUMBER_ULONG: case OF_NUMBER_UINT8: case OF_NUMBER_UINT16: case OF_NUMBER_UINT32: case OF_NUMBER_UINT64: case OF_NUMBER_SIZE: case OF_NUMBER_UINTMAX: case OF_NUMBER_UINTPTR: return [OFString stringWithFormat: @"%ju", [self uIntMaxValue]]; case OF_NUMBER_CHAR: case OF_NUMBER_SHORT: case OF_NUMBER_INT: case OF_NUMBER_LONG: case OF_NUMBER_INT8: case OF_NUMBER_INT16: case OF_NUMBER_INT32: case OF_NUMBER_INT64: case OF_NUMBER_SSIZE: case OF_NUMBER_INTMAX: case OF_NUMBER_PTRDIFF: | > > | 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 | switch (_type) { case OF_NUMBER_BOOL: return (_value.bool_ ? @"YES" : @"NO"); case OF_NUMBER_UCHAR: case OF_NUMBER_USHORT: case OF_NUMBER_UINT: case OF_NUMBER_ULONG: case OF_NUMBER_ULONGLONG: case OF_NUMBER_UINT8: case OF_NUMBER_UINT16: case OF_NUMBER_UINT32: case OF_NUMBER_UINT64: case OF_NUMBER_SIZE: case OF_NUMBER_UINTMAX: case OF_NUMBER_UINTPTR: return [OFString stringWithFormat: @"%ju", [self uIntMaxValue]]; case OF_NUMBER_CHAR: case OF_NUMBER_SHORT: case OF_NUMBER_INT: case OF_NUMBER_LONG: case OF_NUMBER_LONGLONG: case OF_NUMBER_INT8: case OF_NUMBER_INT16: case OF_NUMBER_INT32: case OF_NUMBER_INT64: case OF_NUMBER_SSIZE: case OF_NUMBER_INTMAX: case OF_NUMBER_PTRDIFF: |
︙ | ︙ | |||
1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 | [element addAttributeWithName: @"type" stringValue: @"boolean"]; break; case OF_NUMBER_UCHAR: case OF_NUMBER_USHORT: case OF_NUMBER_UINT: case OF_NUMBER_ULONG: case OF_NUMBER_UINT8: case OF_NUMBER_UINT16: case OF_NUMBER_UINT32: case OF_NUMBER_UINT64: case OF_NUMBER_SIZE: case OF_NUMBER_UINTMAX: case OF_NUMBER_UINTPTR: [element addAttributeWithName: @"type" stringValue: @"unsigned"]; break; case OF_NUMBER_CHAR: case OF_NUMBER_SHORT: case OF_NUMBER_INT: case OF_NUMBER_LONG: case OF_NUMBER_INT8: case OF_NUMBER_INT16: case OF_NUMBER_INT32: case OF_NUMBER_INT64: case OF_NUMBER_SSIZE: case OF_NUMBER_INTMAX: case OF_NUMBER_PTRDIFF: | > > | 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 | [element addAttributeWithName: @"type" stringValue: @"boolean"]; break; case OF_NUMBER_UCHAR: case OF_NUMBER_USHORT: case OF_NUMBER_UINT: case OF_NUMBER_ULONG: case OF_NUMBER_ULONGLONG: case OF_NUMBER_UINT8: case OF_NUMBER_UINT16: case OF_NUMBER_UINT32: case OF_NUMBER_UINT64: case OF_NUMBER_SIZE: case OF_NUMBER_UINTMAX: case OF_NUMBER_UINTPTR: [element addAttributeWithName: @"type" stringValue: @"unsigned"]; break; case OF_NUMBER_CHAR: case OF_NUMBER_SHORT: case OF_NUMBER_INT: case OF_NUMBER_LONG: case OF_NUMBER_LONGLONG: case OF_NUMBER_INT8: case OF_NUMBER_INT16: case OF_NUMBER_INT32: case OF_NUMBER_INT64: case OF_NUMBER_SSIZE: case OF_NUMBER_INTMAX: case OF_NUMBER_PTRDIFF: |
︙ | ︙ |