Overview
Comment: | OFNumber: OF_NUMBER_* -> OF_NUMBER_TYPE_* |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
0de69c89523065c9fbc652b9ed31ff7d |
User & Date: | js on 2014-06-25 16:08:38 |
Other Links: | manifest | tags |
Context
2014-06-25
| ||
17:55 | Small Android fixes check-in: 05a247fbe4 user: js tags: trunk | |
16:08 | OFNumber: OF_NUMBER_* -> OF_NUMBER_TYPE_* check-in: 0de69c8952 user: js tags: trunk | |
2014-06-23
| ||
09:39 | lookup-asm-sparc-elf.S: No new frame for ret_nil check-in: 0ec00e785f user: js tags: trunk | |
Changes
Modified src/OFNumber.h from [ba305281bd] to [a9d8cfa7c2].
︙ | ︙ | |||
31 32 33 34 35 36 37 | /*! @file */ /*! * @brief The C type of a number stored in an OFNumber. */ typedef enum { /*! bool */ | | | | | | | | | | | | | | | | > | > | > | > > | | > | > | > | > | > > | | | | | | 31 32 33 34 35 36 37 38 39 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 | /*! @file */ /*! * @brief The C type of a number stored in an OFNumber. */ typedef enum { /*! bool */ OF_NUMBER_TYPE_BOOL = 0x01, /*! unsigned char */ OF_NUMBER_TYPE_UCHAR = 0x02, /*! unsigned short */ OF_NUMBER_TYPE_USHORT = 0x03, /*! unsigned int */ OF_NUMBER_TYPE_UINT = 0x04, /*! unsigned long */ OF_NUMBER_TYPE_ULONG = 0x05, /*! unsigned long long */ OF_NUMBER_TYPE_ULONGLONG = 0x06, /*! size_t */ OF_NUMBER_TYPE_SIZE = 0x07, /*! uint8_t */ OF_NUMBER_TYPE_UINT8 = 0x08, /*! uint16_t */ OF_NUMBER_TYPE_UINT16 = 0x09, /*! uint32_t */ OF_NUMBER_TYPE_UINT32 = 0x0A, /*! uint64_t */ OF_NUMBER_TYPE_UINT64 = 0x0B, /*! uintptr_t */ OF_NUMBER_TYPE_UINTPTR = 0x0C, /*! uintmax_t */ OF_NUMBER_TYPE_UINTMAX = 0x0D, OF_NUMBER_TYPE_SIGNED = 0x10, /*! signed char */ OF_NUMBER_TYPE_CHAR = OF_NUMBER_TYPE_UCHAR | OF_NUMBER_TYPE_SIGNED, /*! signed short */ OF_NUMBER_TYPE_SHORT = OF_NUMBER_TYPE_USHORT | OF_NUMBER_TYPE_SIGNED, /*! signed int */ OF_NUMBER_TYPE_INT = OF_NUMBER_TYPE_UINT | OF_NUMBER_TYPE_SIGNED, /*! signed long */ OF_NUMBER_TYPE_LONG = OF_NUMBER_TYPE_ULONG | OF_NUMBER_TYPE_SIGNED, /*! signed long long */ OF_NUMBER_TYPE_LONGLONG = OF_NUMBER_TYPE_ULONGLONG | OF_NUMBER_TYPE_SIGNED, /*! int8_t */ OF_NUMBER_TYPE_INT8 = OF_NUMBER_TYPE_UINT8 | OF_NUMBER_TYPE_SIGNED, /*! int16_t */ OF_NUMBER_TYPE_INT16 = OF_NUMBER_TYPE_UINT16 | OF_NUMBER_TYPE_SIGNED, /*! int32_t */ OF_NUMBER_TYPE_INT32 = OF_NUMBER_TYPE_UINT32 | OF_NUMBER_TYPE_SIGNED, /*! int64_t */ OF_NUMBER_TYPE_INT64 = OF_NUMBER_TYPE_UINT64 | OF_NUMBER_TYPE_SIGNED, /*! ssize_t */ OF_NUMBER_TYPE_SSIZE = OF_NUMBER_TYPE_SIZE | OF_NUMBER_TYPE_SIGNED, /*! intmax_t */ OF_NUMBER_TYPE_INTMAX = OF_NUMBER_TYPE_UINTMAX | OF_NUMBER_TYPE_SIGNED, /*! ptrdiff_t */ OF_NUMBER_TYPE_PTRDIFF = 0x0E | OF_NUMBER_TYPE_SIGNED, /*! intptr_t */ OF_NUMBER_TYPE_INTPTR = 0x0F | OF_NUMBER_TYPE_SIGNED, /*! float */ OF_NUMBER_TYPE_FLOAT = 0x20, /*! double */ OF_NUMBER_TYPE_DOUBLE = 0x40 | OF_NUMBER_TYPE_FLOAT, } of_number_type_t; /*! * @class OFNumber OFNumber.h ObjFW/OFNumber.h * * @brief Provides a way to store a number in an object. */ |
︙ | ︙ |
Modified src/OFNumber.m from [f23f2bec10] to [57878896f8].
︙ | ︙ | |||
26 27 28 29 30 31 32 | #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFOutOfRangeException.h" #define RETURN_AS(t) \ switch (_type) { \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 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 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 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 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 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 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 | #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFOutOfRangeException.h" #define RETURN_AS(t) \ switch (_type) { \ case OF_NUMBER_TYPE_BOOL: \ return (t)_value.bool_; \ case OF_NUMBER_TYPE_CHAR: \ return (t)_value.schar; \ case OF_NUMBER_TYPE_SHORT: \ return (t)_value.sshort; \ case OF_NUMBER_TYPE_INT: \ return (t)_value.sint; \ case OF_NUMBER_TYPE_LONG: \ return (t)_value.slong; \ case OF_NUMBER_TYPE_LONGLONG: \ return (t)_value.slonglong; \ case OF_NUMBER_TYPE_UCHAR: \ return (t)_value.uchar; \ case OF_NUMBER_TYPE_USHORT: \ return (t)_value.ushort; \ case OF_NUMBER_TYPE_UINT: \ return (t)_value.uint; \ case OF_NUMBER_TYPE_ULONG: \ return (t)_value.ulong; \ case OF_NUMBER_TYPE_ULONGLONG: \ return (t)_value.ulonglong; \ case OF_NUMBER_TYPE_INT8: \ return (t)_value.int8; \ case OF_NUMBER_TYPE_INT16: \ return (t)_value.int16; \ case OF_NUMBER_TYPE_INT32: \ return (t)_value.int32; \ case OF_NUMBER_TYPE_INT64: \ return (t)_value.int64; \ case OF_NUMBER_TYPE_UINT8: \ return (t)_value.uint8; \ case OF_NUMBER_TYPE_UINT16: \ return (t)_value.uint16; \ case OF_NUMBER_TYPE_UINT32: \ return (t)_value.uint32; \ case OF_NUMBER_TYPE_UINT64: \ return (t)_value.uint64; \ case OF_NUMBER_TYPE_SIZE: \ return (t)_value.size; \ case OF_NUMBER_TYPE_SSIZE: \ return (t)_value.ssize; \ case OF_NUMBER_TYPE_INTMAX: \ return (t)_value.intmax; \ case OF_NUMBER_TYPE_UINTMAX: \ return (t)_value.uintmax; \ case OF_NUMBER_TYPE_PTRDIFF: \ return (t)_value.ptrdiff; \ case OF_NUMBER_TYPE_INTPTR: \ return (t)_value.intptr; \ case OF_NUMBER_TYPE_UINTPTR: \ return (t)_value.uintptr; \ case OF_NUMBER_TYPE_FLOAT: \ return (t)_value.float_; \ case OF_NUMBER_TYPE_DOUBLE: \ return (t)_value.double_; \ default: \ @throw [OFInvalidFormatException exception]; \ } #define CALCULATE(o, n) \ switch (_type) { \ case OF_NUMBER_TYPE_BOOL: \ return [OFNumber numberWithBool: \ _value.bool_ o [n boolValue]]; \ case OF_NUMBER_TYPE_CHAR: \ return [OFNumber numberWithChar: \ _value.schar o [n charValue]]; \ case OF_NUMBER_TYPE_SHORT: \ return [OFNumber numberWithShort: \ _value.sshort o [n shortValue]]; \ case OF_NUMBER_TYPE_INT: \ return [OFNumber numberWithInt: \ _value.sint o [n intValue]]; \ case OF_NUMBER_TYPE_LONG: \ return [OFNumber numberWithLong: \ _value.slong o [n longValue]]; \ case OF_NUMBER_TYPE_LONGLONG: \ return [OFNumber numberWithLongLong: \ _value.slonglong o [n longLongValue]]; \ case OF_NUMBER_TYPE_UCHAR: \ return [OFNumber numberWithUnsignedChar: \ _value.uchar o [n unsignedCharValue]]; \ case OF_NUMBER_TYPE_USHORT: \ return [OFNumber numberWithUnsignedShort: \ _value.ushort o [n unsignedShortValue]]; \ case OF_NUMBER_TYPE_UINT: \ return [OFNumber numberWithUnsignedInt: \ _value.uint o [n unsignedIntValue]]; \ case OF_NUMBER_TYPE_ULONG: \ return [OFNumber numberWithUnsignedLong: \ _value.ulong o [n unsignedLongValue]]; \ case OF_NUMBER_TYPE_ULONGLONG: \ return [OFNumber numberWithUnsignedLongLong: \ _value.ulonglong o [n unsignedLongLongValue]]; \ case OF_NUMBER_TYPE_INT8: \ return [OFNumber numberWithInt8: \ _value.int8 o [n int8Value]]; \ case OF_NUMBER_TYPE_INT16: \ return [OFNumber numberWithInt16: \ _value.int16 o [n int16Value]]; \ case OF_NUMBER_TYPE_INT32: \ return [OFNumber numberWithInt32: \ _value.int32 o [n int32Value]]; \ case OF_NUMBER_TYPE_INT64: \ return [OFNumber numberWithInt64: \ _value.int64 o [n int64Value]]; \ case OF_NUMBER_TYPE_UINT8: \ return [OFNumber numberWithUInt8: \ _value.uint8 o [n uInt8Value]]; \ case OF_NUMBER_TYPE_UINT16: \ return [OFNumber numberWithUInt16: \ _value.uint16 o [n uInt16Value]]; \ case OF_NUMBER_TYPE_UINT32: \ return [OFNumber numberWithUInt32: \ _value.uint32 o [n uInt32Value]]; \ case OF_NUMBER_TYPE_UINT64: \ return [OFNumber numberWithUInt64: \ _value.uint64 o [n uInt64Value]]; \ case OF_NUMBER_TYPE_SIZE: \ return [OFNumber numberWithSize: \ _value.size o [n sizeValue]]; \ case OF_NUMBER_TYPE_SSIZE: \ return [OFNumber numberWithSSize: \ _value.ssize o [n sSizeValue]]; \ case OF_NUMBER_TYPE_INTMAX: \ return [OFNumber numberWithIntMax: \ _value.intmax o [n intMaxValue]]; \ case OF_NUMBER_TYPE_UINTMAX: \ return [OFNumber numberWithUIntMax: \ _value.uintmax o [n uIntMaxValue]]; \ case OF_NUMBER_TYPE_PTRDIFF: \ return [OFNumber numberWithPtrDiff: \ _value.ptrdiff o [n ptrDiffValue]]; \ case OF_NUMBER_TYPE_INTPTR: \ return [OFNumber numberWithIntPtr: \ _value.intptr o [n intPtrValue]]; \ case OF_NUMBER_TYPE_UINTPTR: \ return [OFNumber numberWithUIntPtr: \ _value.uintptr o [n uIntPtrValue]]; \ case OF_NUMBER_TYPE_FLOAT: \ return [OFNumber numberWithFloat: \ _value.float_ o [n floatValue]]; \ case OF_NUMBER_TYPE_DOUBLE: \ return [OFNumber numberWithDouble: \ _value.double_ o [n doubleValue]]; \ default: \ @throw [OFInvalidFormatException exception]; \ } #define CALCULATE2(o, n) \ switch (_type) { \ case OF_NUMBER_TYPE_BOOL: \ return [OFNumber numberWithBool: \ _value.bool_ o [n boolValue]]; \ case OF_NUMBER_TYPE_CHAR: \ return [OFNumber numberWithChar: \ _value.schar o [n charValue]]; \ case OF_NUMBER_TYPE_SHORT: \ return [OFNumber numberWithShort: \ _value.sshort o [n shortValue]]; \ case OF_NUMBER_TYPE_INT: \ return [OFNumber numberWithInt: \ _value.sint o [n intValue]]; \ case OF_NUMBER_TYPE_LONG: \ return [OFNumber numberWithLong: \ _value.slong o [n longValue]]; \ case OF_NUMBER_TYPE_LONGLONG: \ return [OFNumber numberWithLongLong: \ _value.slonglong o [n longLongValue]]; \ case OF_NUMBER_TYPE_UCHAR: \ return [OFNumber numberWithUnsignedChar: \ _value.uchar o [n unsignedCharValue]]; \ case OF_NUMBER_TYPE_USHORT: \ return [OFNumber numberWithUnsignedShort: \ _value.ushort o [n unsignedShortValue]]; \ case OF_NUMBER_TYPE_UINT: \ return [OFNumber numberWithUnsignedInt: \ _value.uint o [n unsignedIntValue]]; \ case OF_NUMBER_TYPE_ULONG: \ return [OFNumber numberWithUnsignedLong: \ _value.ulong o [n unsignedLongValue]]; \ case OF_NUMBER_TYPE_ULONGLONG: \ return [OFNumber numberWithUnsignedLongLong: \ _value.ulonglong o [n unsignedLongLongValue]]; \ case OF_NUMBER_TYPE_INT8: \ return [OFNumber numberWithInt8: \ _value.int8 o [n int8Value]]; \ case OF_NUMBER_TYPE_INT16: \ return [OFNumber numberWithInt16: \ _value.int16 o [n int16Value]]; \ case OF_NUMBER_TYPE_INT32: \ return [OFNumber numberWithInt32: \ _value.int32 o [n int32Value]]; \ case OF_NUMBER_TYPE_INT64: \ return [OFNumber numberWithInt64: \ _value.int64 o [n int64Value]]; \ case OF_NUMBER_TYPE_UINT8: \ return [OFNumber numberWithUInt8: \ _value.uint8 o [n uInt8Value]]; \ case OF_NUMBER_TYPE_UINT16: \ return [OFNumber numberWithUInt16: \ _value.uint16 o [n uInt16Value]]; \ case OF_NUMBER_TYPE_UINT32: \ return [OFNumber numberWithUInt32: \ _value.uint32 o [n uInt32Value]]; \ case OF_NUMBER_TYPE_UINT64: \ return [OFNumber numberWithUInt64: \ _value.uint64 o [n uInt64Value]]; \ case OF_NUMBER_TYPE_SIZE: \ return [OFNumber numberWithSize: \ _value.size o [n sizeValue]]; \ case OF_NUMBER_TYPE_SSIZE: \ return [OFNumber numberWithSSize: \ _value.ssize o [n sSizeValue]]; \ case OF_NUMBER_TYPE_INTMAX: \ return [OFNumber numberWithIntMax: \ _value.intmax o [n intMaxValue]]; \ case OF_NUMBER_TYPE_UINTMAX: \ return [OFNumber numberWithUIntMax: \ _value.uintmax o [n uIntMaxValue]]; \ case OF_NUMBER_TYPE_PTRDIFF: \ return [OFNumber numberWithPtrDiff: \ _value.ptrdiff o [n ptrDiffValue]]; \ case OF_NUMBER_TYPE_INTPTR: \ return [OFNumber numberWithIntPtr: \ _value.intptr o [n intPtrValue]]; \ case OF_NUMBER_TYPE_UINTPTR: \ return [OFNumber numberWithUIntPtr: \ _value.uintptr o [n uIntPtrValue]]; \ case OF_NUMBER_TYPE_FLOAT: \ case OF_NUMBER_TYPE_DOUBLE: \ @throw [OFInvalidArgumentException exception]; \ default: \ @throw [OFInvalidFormatException exception]; \ } #define CALCULATE3(o) \ switch (_type) { \ case OF_NUMBER_TYPE_BOOL: \ return [OFNumber numberWithBool: _value.bool_ o]; \ case OF_NUMBER_TYPE_CHAR: \ return [OFNumber numberWithChar: _value.schar o]; \ case OF_NUMBER_TYPE_SHORT: \ return [OFNumber numberWithShort: _value.sshort o]; \ case OF_NUMBER_TYPE_INT: \ return [OFNumber numberWithInt: _value.sint o]; \ case OF_NUMBER_TYPE_LONG: \ return [OFNumber numberWithLong: _value.slong o]; \ case OF_NUMBER_TYPE_LONGLONG: \ return [OFNumber numberWithLongLong: \ _value.slonglong o]; \ case OF_NUMBER_TYPE_UCHAR: \ return [OFNumber numberWithUnsignedChar: \ _value.uchar o]; \ case OF_NUMBER_TYPE_USHORT: \ return [OFNumber numberWithUnsignedShort: \ _value.ushort o]; \ case OF_NUMBER_TYPE_UINT: \ return [OFNumber numberWithUnsignedInt: _value.uint o]; \ case OF_NUMBER_TYPE_ULONG: \ return [OFNumber numberWithUnsignedLong: \ _value.ulong o]; \ case OF_NUMBER_TYPE_ULONGLONG: \ return [OFNumber numberWithUnsignedLongLong: \ _value.ulonglong o]; \ case OF_NUMBER_TYPE_INT8: \ return [OFNumber numberWithInt8: _value.int8 o]; \ case OF_NUMBER_TYPE_INT16: \ return [OFNumber numberWithInt16: _value.int16 o]; \ case OF_NUMBER_TYPE_INT32: \ return [OFNumber numberWithInt32: _value.int32 o]; \ case OF_NUMBER_TYPE_INT64: \ return [OFNumber numberWithInt64: _value.int64 o]; \ case OF_NUMBER_TYPE_UINT8: \ return [OFNumber numberWithUInt8: _value.uint8 o]; \ case OF_NUMBER_TYPE_UINT16: \ return [OFNumber numberWithUInt16: _value.uint16 o]; \ case OF_NUMBER_TYPE_UINT32: \ return [OFNumber numberWithUInt32: _value.uint32 o]; \ case OF_NUMBER_TYPE_UINT64: \ return [OFNumber numberWithUInt64: _value.uint64 o]; \ case OF_NUMBER_TYPE_SIZE: \ return [OFNumber numberWithSize: _value.size o]; \ case OF_NUMBER_TYPE_SSIZE: \ return [OFNumber numberWithSSize: _value.ssize o]; \ case OF_NUMBER_TYPE_INTMAX: \ return [OFNumber numberWithIntMax: _value.intmax o]; \ case OF_NUMBER_TYPE_UINTMAX: \ return [OFNumber numberWithUIntMax: _value.uintmax o]; \ case OF_NUMBER_TYPE_PTRDIFF: \ return [OFNumber numberWithPtrDiff: _value.ptrdiff o]; \ case OF_NUMBER_TYPE_INTPTR: \ return [OFNumber numberWithIntPtr: _value.intptr o]; \ case OF_NUMBER_TYPE_UINTPTR: \ return [OFNumber numberWithUIntPtr: _value.uintptr o]; \ case OF_NUMBER_TYPE_FLOAT: \ return [OFNumber numberWithFloat: _value.float_ o]; \ case OF_NUMBER_TYPE_DOUBLE: \ return [OFNumber numberWithDouble: _value.double_ o]; \ default: \ @throw [OFInvalidFormatException exception]; \ } @interface OFNumber (OF_PRIVATE_CATEGORY) - (OFString*)OF_JSONRepresentationWithOptions: (int)options |
︙ | ︙ | |||
483 484 485 486 487 488 489 | } - initWithBool: (bool)bool_ { self = [super init]; _value.bool_ = bool_; | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 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 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 | } - initWithBool: (bool)bool_ { self = [super init]; _value.bool_ = bool_; _type = OF_NUMBER_TYPE_BOOL; return self; } - initWithChar: (signed char)schar { self = [super init]; _value.schar = schar; _type = OF_NUMBER_TYPE_CHAR; return self; } - initWithShort: (signed short)sshort { self = [super init]; _value.sshort = sshort; _type = OF_NUMBER_TYPE_SHORT; return self; } - initWithInt: (signed int)sint { self = [super init]; _value.sint = sint; _type = OF_NUMBER_TYPE_INT; return self; } - initWithLong: (signed long)slong { self = [super init]; _value.slong = slong; _type = OF_NUMBER_TYPE_LONG; return self; } - initWithLongLong: (signed long long)slonglong { self = [super init]; _value.slonglong = slonglong; _type = OF_NUMBER_TYPE_LONGLONG; return self; } - initWithUnsignedChar: (unsigned char)uchar { self = [super init]; _value.uchar = uchar; _type = OF_NUMBER_TYPE_UCHAR; return self; } - initWithUnsignedShort: (unsigned short)ushort { self = [super init]; _value.ushort = ushort; _type = OF_NUMBER_TYPE_USHORT; return self; } - initWithUnsignedInt: (unsigned int)uint { self = [super init]; _value.uint = uint; _type = OF_NUMBER_TYPE_UINT; return self; } - initWithUnsignedLong: (unsigned long)ulong { self = [super init]; _value.ulong = ulong; _type = OF_NUMBER_TYPE_ULONG; return self; } - initWithUnsignedLongLong: (unsigned long long)ulonglong { self = [super init]; _value.ulonglong = ulonglong; _type = OF_NUMBER_TYPE_ULONGLONG; return self; } - initWithInt8: (int8_t)int8 { self = [super init]; _value.int8 = int8; _type = OF_NUMBER_TYPE_INT8; return self; } - initWithInt16: (int16_t)int16 { self = [super init]; _value.int16 = int16; _type = OF_NUMBER_TYPE_INT16; return self; } - initWithInt32: (int32_t)int32 { self = [super init]; _value.int32 = int32; _type = OF_NUMBER_TYPE_INT32; return self; } - initWithInt64: (int64_t)int64 { self = [super init]; _value.int64 = int64; _type = OF_NUMBER_TYPE_INT64; return self; } - initWithUInt8: (uint8_t)uint8 { self = [super init]; _value.uint8 = uint8; _type = OF_NUMBER_TYPE_UINT8; return self; } - initWithUInt16: (uint16_t)uint16 { self = [super init]; _value.uint16 = uint16; _type = OF_NUMBER_TYPE_UINT16; return self; } - initWithUInt32: (uint32_t)uint32 { self = [super init]; _value.uint32 = uint32; _type = OF_NUMBER_TYPE_UINT32; return self; } - initWithUInt64: (uint64_t)uint64 { self = [super init]; _value.uint64 = uint64; _type = OF_NUMBER_TYPE_UINT64; return self; } - initWithSize: (size_t)size { self = [super init]; _value.size = size; _type = OF_NUMBER_TYPE_SIZE; return self; } - initWithSSize: (ssize_t)ssize { self = [super init]; _value.ssize = ssize; _type = OF_NUMBER_TYPE_SSIZE; return self; } - initWithIntMax: (intmax_t)intmax { self = [super init]; _value.intmax = intmax; _type = OF_NUMBER_TYPE_INTMAX; return self; } - initWithUIntMax: (uintmax_t)uintmax { self = [super init]; _value.uintmax = uintmax; _type = OF_NUMBER_TYPE_UINTMAX; return self; } - initWithPtrDiff: (ptrdiff_t)ptrdiff { self = [super init]; _value.ptrdiff = ptrdiff; _type = OF_NUMBER_TYPE_PTRDIFF; return self; } - initWithIntPtr: (intptr_t)intptr { self = [super init]; _value.intptr = intptr; _type = OF_NUMBER_TYPE_INTPTR; return self; } - initWithUIntPtr: (uintptr_t)uintptr { self = [super init]; _value.uintptr = uintptr; _type = OF_NUMBER_TYPE_UINTPTR; return self; } - initWithFloat: (float)float_ { self = [super init]; _value.float_ = float_; _type = OF_NUMBER_TYPE_FLOAT; return self; } - initWithDouble: (double)double_ { self = [super init]; _value.double_ = double_; _type = OF_NUMBER_TYPE_DOUBLE; return self; } - initWithSerialization: (OFXMLElement*)element { self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); OFString *typeString; if (![[element name] isEqual: [self className]] || ![[element namespace] isEqual: OF_SERIALIZATION_NS]) @throw [OFInvalidArgumentException exception]; typeString = [[element attributeForName: @"type"] stringValue]; if ([typeString isEqual: @"boolean"]) { _type = OF_NUMBER_TYPE_BOOL; if ([[element stringValue] isEqual: @"true"]) _value.bool_ = true; else if ([[element stringValue] isEqual: @"false"]) _value.bool_ = false; else @throw [OFInvalidArgumentException exception]; } else if ([typeString isEqual: @"unsigned"]) { /* * FIXME: This will fail if the value is bigger than * INTMAX_MAX! */ _type = OF_NUMBER_TYPE_UINTMAX; _value.uintmax = [element decimalValue]; } else if ([typeString isEqual: @"signed"]) { _type = OF_NUMBER_TYPE_INTMAX; _value.intmax = [element decimalValue]; } else if ([typeString isEqual: @"float"]) { union { float f; uint32_t u; } f; f.u = (uint32_t)[element hexadecimalValue]; _type = OF_NUMBER_TYPE_FLOAT; _value.float_ = f.f; } else if ([typeString isEqual: @"double"]) { union { double d; uint64_t u; } d; d.u = (uint64_t)[element hexadecimalValue]; _type = OF_NUMBER_TYPE_DOUBLE; _value.double_ = d.d; } else @throw [OFInvalidArgumentException exception]; objc_autoreleasePoolPop(pool); } @catch (id e) { [self release]; |
︙ | ︙ | |||
977 978 979 980 981 982 983 | OFNumber *number; if (![object isKindOfClass: [OFNumber class]]) return false; number = object; | | > | > | > | | | 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 | OFNumber *number; if (![object isKindOfClass: [OFNumber class]]) return false; number = object; if (_type & OF_NUMBER_TYPE_FLOAT || number->_type & OF_NUMBER_TYPE_FLOAT) { double value1 = [number doubleValue]; double value2 = [self doubleValue]; if (isnan(value1) && isnan(value2)) return true; if (isnan(value1) || isnan(value2)) return false; return (value1 == value2); } if (_type & OF_NUMBER_TYPE_SIGNED || number->_type & OF_NUMBER_TYPE_SIGNED) return ([number intMaxValue] == [self intMaxValue]); return ([number uIntMaxValue] == [self uIntMaxValue]); } - (of_comparison_result_t)compare: (id <OFComparing>)object { OFNumber *number; if (![object isKindOfClass: [OFNumber class]]) @throw [OFInvalidArgumentException exception]; number = (OFNumber*)object; if (_type & OF_NUMBER_TYPE_FLOAT || number->_type & OF_NUMBER_TYPE_FLOAT) { double double1 = [self doubleValue]; double double2 = [number doubleValue]; if (double1 > double2) return OF_ORDERED_DESCENDING; if (double1 < double2) return OF_ORDERED_ASCENDING; return OF_ORDERED_SAME; } else if (_type & OF_NUMBER_TYPE_SIGNED || number->_type & OF_NUMBER_TYPE_SIGNED) { intmax_t int1 = [self intMaxValue]; intmax_t int2 = [number intMaxValue]; if (int1 > int2) return OF_ORDERED_DESCENDING; if (int1 < int2) return OF_ORDERED_ASCENDING; |
︙ | ︙ | |||
1044 1045 1046 1047 1048 1049 1050 | - (uint32_t)hash { of_number_type_t type = _type; uint32_t hash; /* Do we really need signed to represent this number? */ | | | | | | | | | | 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 | - (uint32_t)hash { of_number_type_t type = _type; uint32_t hash; /* Do we really need signed to represent this number? */ if (type & OF_NUMBER_TYPE_SIGNED && [self intMaxValue] >= 0) type &= ~OF_NUMBER_TYPE_SIGNED; /* Do we really need floating point to represent this number? */ if (type & OF_NUMBER_TYPE_FLOAT) { double v = [self doubleValue]; if (v < 0) { if (v == [self intMaxValue]) { type &= ~OF_NUMBER_TYPE_FLOAT; type |= OF_NUMBER_TYPE_SIGNED; } } else { if (v == [self uIntMaxValue]) type &= ~OF_NUMBER_TYPE_FLOAT; } } OF_HASH_INIT(hash); if (type & OF_NUMBER_TYPE_FLOAT) { union { double d; uint8_t b[sizeof(double)]; } d; uint_fast8_t i; if (isnan([self doubleValue])) return 0; d.d = OF_BSWAP_DOUBLE_IF_BE([self doubleValue]); for (i = 0; i < sizeof(double); i++) OF_HASH_ADD(hash, d.b[i]); } else if (type & OF_NUMBER_TYPE_SIGNED) { intmax_t v = [self intMaxValue] * -1; while (v != 0) { OF_HASH_ADD(hash, v & 0xFF); v >>= 8; } |
︙ | ︙ | |||
1159 1160 1161 1162 1163 1164 1165 | { CALCULATE3(- 1) } - (OFNumber*)remainderOfDivisionWithNumber: (OFNumber*)number { switch (_type) { | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 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 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 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 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 | { CALCULATE3(- 1) } - (OFNumber*)remainderOfDivisionWithNumber: (OFNumber*)number { switch (_type) { case OF_NUMBER_TYPE_BOOL: return [OFNumber numberWithBool: _value.bool_ % [number boolValue]]; case OF_NUMBER_TYPE_CHAR: return [OFNumber numberWithChar: _value.schar % [number charValue]]; case OF_NUMBER_TYPE_SHORT: return [OFNumber numberWithShort: _value.sshort % [number shortValue]]; case OF_NUMBER_TYPE_INT: return [OFNumber numberWithInt: _value.sint % [number intValue]]; case OF_NUMBER_TYPE_LONG: return [OFNumber numberWithLong: _value.slong % [number longValue]]; case OF_NUMBER_TYPE_LONGLONG: return [OFNumber numberWithLongLong: _value.slonglong % [number longLongValue]]; case OF_NUMBER_TYPE_UCHAR: return [OFNumber numberWithUnsignedChar: _value.uchar % [number unsignedCharValue]]; case OF_NUMBER_TYPE_USHORT: return [OFNumber numberWithUnsignedShort: _value.ushort % [number unsignedShortValue]]; case OF_NUMBER_TYPE_UINT: return [OFNumber numberWithUnsignedInt: _value.uint % [number unsignedIntValue]]; case OF_NUMBER_TYPE_ULONG: return [OFNumber numberWithUnsignedLong: _value.ulong % [number unsignedLongValue]]; case OF_NUMBER_TYPE_ULONGLONG: return [OFNumber numberWithUnsignedLongLong: _value.ulonglong % [number unsignedLongLongValue]]; case OF_NUMBER_TYPE_INT8: return [OFNumber numberWithInt8: _value.int8 % [number int8Value]]; case OF_NUMBER_TYPE_INT16: return [OFNumber numberWithInt16: _value.int16 % [number int16Value]]; case OF_NUMBER_TYPE_INT32: return [OFNumber numberWithInt32: _value.int32 % [number int32Value]]; case OF_NUMBER_TYPE_INT64: return [OFNumber numberWithInt64: _value.int64 % [number int64Value]]; case OF_NUMBER_TYPE_UINT8: return [OFNumber numberWithUInt8: _value.uint8 % [number uInt8Value]]; case OF_NUMBER_TYPE_UINT16: return [OFNumber numberWithUInt16: _value.uint16 % [number uInt16Value]]; case OF_NUMBER_TYPE_UINT32: return [OFNumber numberWithUInt32: _value.uint32 % [number uInt32Value]]; case OF_NUMBER_TYPE_UINT64: return [OFNumber numberWithUInt64: _value.uint64 % [number uInt64Value]]; case OF_NUMBER_TYPE_SIZE: return [OFNumber numberWithSize: _value.size % [number sizeValue]]; case OF_NUMBER_TYPE_SSIZE: return [OFNumber numberWithSSize: _value.ssize % [number sSizeValue]]; case OF_NUMBER_TYPE_INTMAX: return [OFNumber numberWithIntMax: _value.intmax % [number intMaxValue]]; case OF_NUMBER_TYPE_UINTMAX: return [OFNumber numberWithUIntMax: _value.uintmax % [number uIntMaxValue]]; case OF_NUMBER_TYPE_PTRDIFF: return [OFNumber numberWithPtrDiff: _value.ptrdiff % [number ptrDiffValue]]; case OF_NUMBER_TYPE_INTPTR: return [OFNumber numberWithIntPtr: _value.intptr % [number intPtrValue]]; case OF_NUMBER_TYPE_UINTPTR: return [OFNumber numberWithUIntPtr: _value.uintptr % [number uIntPtrValue]]; case OF_NUMBER_TYPE_FLOAT: return [OFNumber numberWithFloat: fmodf(_value.float_, [number floatValue])]; case OF_NUMBER_TYPE_DOUBLE: return [OFNumber numberWithDouble: fmod(_value.double_, [number doubleValue])]; default: @throw [OFInvalidFormatException exception]; } } - copy { return [self retain]; } - (OFString*)description { OFMutableString *ret; switch (_type) { case OF_NUMBER_TYPE_BOOL: return (_value.bool_ ? @"true" : @"false"); case OF_NUMBER_TYPE_UCHAR: case OF_NUMBER_TYPE_USHORT: case OF_NUMBER_TYPE_UINT: case OF_NUMBER_TYPE_ULONG: case OF_NUMBER_TYPE_ULONGLONG: case OF_NUMBER_TYPE_UINT8: case OF_NUMBER_TYPE_UINT16: case OF_NUMBER_TYPE_UINT32: case OF_NUMBER_TYPE_UINT64: case OF_NUMBER_TYPE_SIZE: case OF_NUMBER_TYPE_UINTMAX: case OF_NUMBER_TYPE_UINTPTR: return [OFString stringWithFormat: @"%ju", [self uIntMaxValue]]; case OF_NUMBER_TYPE_CHAR: case OF_NUMBER_TYPE_SHORT: case OF_NUMBER_TYPE_INT: case OF_NUMBER_TYPE_LONG: case OF_NUMBER_TYPE_LONGLONG: case OF_NUMBER_TYPE_INT8: case OF_NUMBER_TYPE_INT16: case OF_NUMBER_TYPE_INT32: case OF_NUMBER_TYPE_INT64: case OF_NUMBER_TYPE_SSIZE: case OF_NUMBER_TYPE_INTMAX: case OF_NUMBER_TYPE_PTRDIFF: case OF_NUMBER_TYPE_INTPTR: return [OFString stringWithFormat: @"%jd", [self intMaxValue]]; case OF_NUMBER_TYPE_FLOAT: ret = [OFMutableString stringWithFormat: @"%g", _value.float_]; if (![ret containsString: @"."]) [ret appendString: @".0"]; [ret makeImmutable]; return ret; case OF_NUMBER_TYPE_DOUBLE: ret = [OFMutableString stringWithFormat: @"%g", _value.double_]; if (![ret containsString: @"."]) [ret appendString: @".0"]; [ret makeImmutable]; |
︙ | ︙ | |||
1321 1322 1323 1324 1325 1326 1327 | OFXMLElement *element; element = [OFXMLElement elementWithName: [self className] namespace: OF_SERIALIZATION_NS stringValue: [self description]]; switch (_type) { | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1324 1325 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 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 | OFXMLElement *element; element = [OFXMLElement elementWithName: [self className] namespace: OF_SERIALIZATION_NS stringValue: [self description]]; switch (_type) { case OF_NUMBER_TYPE_BOOL: [element addAttributeWithName: @"type" stringValue: @"boolean"]; break; case OF_NUMBER_TYPE_UCHAR: case OF_NUMBER_TYPE_USHORT: case OF_NUMBER_TYPE_UINT: case OF_NUMBER_TYPE_ULONG: case OF_NUMBER_TYPE_ULONGLONG: case OF_NUMBER_TYPE_UINT8: case OF_NUMBER_TYPE_UINT16: case OF_NUMBER_TYPE_UINT32: case OF_NUMBER_TYPE_UINT64: case OF_NUMBER_TYPE_SIZE: case OF_NUMBER_TYPE_UINTMAX: case OF_NUMBER_TYPE_UINTPTR: [element addAttributeWithName: @"type" stringValue: @"unsigned"]; break; case OF_NUMBER_TYPE_CHAR: case OF_NUMBER_TYPE_SHORT: case OF_NUMBER_TYPE_INT: case OF_NUMBER_TYPE_LONG: case OF_NUMBER_TYPE_LONGLONG: case OF_NUMBER_TYPE_INT8: case OF_NUMBER_TYPE_INT16: case OF_NUMBER_TYPE_INT32: case OF_NUMBER_TYPE_INT64: case OF_NUMBER_TYPE_SSIZE: case OF_NUMBER_TYPE_INTMAX: case OF_NUMBER_TYPE_PTRDIFF: case OF_NUMBER_TYPE_INTPTR:; [element addAttributeWithName: @"type" stringValue: @"signed"]; break; case OF_NUMBER_TYPE_FLOAT:; union { float f; uint32_t u; } f; f.f = _value.float_; [element addAttributeWithName: @"type" stringValue: @"float"]; [element setStringValue: [OFString stringWithFormat: @"%08" PRIx32, f.u]]; break; case OF_NUMBER_TYPE_DOUBLE:; union { double d; uint64_t u; } d; d.d = _value.double_; |
︙ | ︙ | |||
1412 1413 1414 1415 1416 1417 1418 | } - (OFString*)OF_JSONRepresentationWithOptions: (int)options depth: (size_t)depth { double doubleValue; | | | | | | | 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 | } - (OFString*)OF_JSONRepresentationWithOptions: (int)options depth: (size_t)depth { double doubleValue; if (_type == OF_NUMBER_TYPE_BOOL) return (_value.bool_ ? @"true" : @"false"); doubleValue = [self doubleValue]; if (isinf(doubleValue)) { if (options & OF_JSON_REPRESENTATION_JSON5) { if (doubleValue > 0) return @"Infinity"; else return @"-Infinity"; } else @throw [OFInvalidArgumentException exception]; } return [self description]; } - (OFDataArray*)messagePackRepresentation { OFDataArray *data; if (_type == OF_NUMBER_TYPE_BOOL) { uint8_t type; data = [OFDataArray dataArrayWithItemSize: 1 capacity: 1]; if (_value.bool_) type = 0xC3; else type = 0xC2; [data addItem: &type]; } else if (_type == OF_NUMBER_TYPE_FLOAT) { uint8_t type = 0xCA; float tmp = OF_BSWAP_FLOAT_IF_LE(_value.float_); data = [OFDataArray dataArrayWithItemSize: 1 capacity: 5]; [data addItem: &type]; [data addItems: &tmp count: sizeof(tmp)]; } else if (_type == OF_NUMBER_TYPE_DOUBLE) { uint8_t type = 0xCB; double tmp = OF_BSWAP_DOUBLE_IF_LE(_value.double_); data = [OFDataArray dataArrayWithItemSize: 1 capacity: 9]; [data addItem: &type]; [data addItems: &tmp count: sizeof(tmp)]; } else if (_type & OF_NUMBER_TYPE_SIGNED) { intmax_t value = [self intMaxValue]; if (value >= -32 && value < 0) { uint8_t tmp = 0xE0 | ((uint8_t)(value - 32) & 0x1F); data = [OFDataArray dataArrayWithItemSize: 1 capacity: 1]; |
︙ | ︙ |