Overview
| Comment: | OFNumber: Refactor to reduce code size |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
59e1c84d3070e63697ac816b8f23c009 |
| User & Date: | js on 2020-07-19 11:49:48 |
| Other Links: | manifest | tags |
Context
|
2020-07-19
| ||
| 12:00 | README.md: Update the broken Xcode versions list check-in: 6a89f40114 user: js tags: trunk | |
| 11:49 | OFNumber: Refactor to reduce code size check-in: 59e1c84d30 user: js tags: trunk | |
| 11:03 | OFNumber: Always use the smallest type that fits check-in: 5e8cca7678 user: js tags: trunk | |
Changes
Modified src/OFNumber.h from [dfa33f4cd7] to [8668a7987f].
| ︙ | ︙ | |||
33 34 35 36 37 38 39 | #import "OFSerialization.h" #import "OFValue.h" OF_ASSUME_NONNULL_BEGIN /*! @file */ | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < | | < < < < < | > > > | > | < < < < | 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 |
#import "OFSerialization.h"
#import "OFValue.h"
OF_ASSUME_NONNULL_BEGIN
/*! @file */
/*!
* @class OFNumber OFNumber.h ObjFW/OFNumber.h
*
* @brief Provides a way to store a number in an object.
*/
#ifndef OF_NUMBER_M
OF_SUBCLASSING_RESTRICTED
#endif
@interface OFNumber: OFValue <OFComparing, OFSerialization,
OFJSONRepresentation, OFMessagePackRepresentation>
{
union of_number_value {
double float_;
intmax_t signed_;
uintmax_t unsigned_;
} _value;
enum of_number_type {
OF_NUMBER_TYPE_FLOAT = 1,
OF_NUMBER_TYPE_SIGNED,
OF_NUMBER_TYPE_UNSIGNED
} _type;
const char *_typeEncoding;
}
/*!
* @brief The OFNumber as a `bool`.
*/
@property (readonly, nonatomic) bool boolValue;
/*!
* @brief The OFNumber as a `signed char`.
|
| ︙ | ︙ |
Modified src/OFNumber.m from [68a0381598] to [f930cc4476].
| ︙ | ︙ | |||
29 30 31 32 33 34 35 |
#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"
#import "OFOutOfRangeException.h"
#define RETURN_AS(t) \
switch (_type) { \
| < < < < | < < | | | < < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 |
#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"
#import "OFOutOfRangeException.h"
#define RETURN_AS(t) \
switch (_type) { \
case OF_NUMBER_TYPE_FLOAT: \
return (t)_value.float_; \
case OF_NUMBER_TYPE_SIGNED: \
return (t)_value.signed_; \
case OF_NUMBER_TYPE_UNSIGNED: \
return (t)_value.unsigned_; \
default: \
@throw [OFInvalidFormatException exception]; \
}
static struct {
Class isa;
} placeholder;
|
| ︙ | ︙ | |||
369 370 371 372 373 374 375 |
- (instancetype)initWithSerialization: (OFXMLElement *)element
{
return (id)[[OFNumber of_alloc] initWithSerialization: element];
}
@end
@implementation OFNumber
| < < | 319 320 321 322 323 324 325 326 327 328 329 330 331 332 |
- (instancetype)initWithSerialization: (OFXMLElement *)element
{
return (id)[[OFNumber of_alloc] initWithSerialization: element];
}
@end
@implementation OFNumber
+ (void)initialize
{
if (self == [OFNumber class])
placeholder.isa = [OFNumberPlaceholder class];
}
+ (instancetype)of_alloc
|
| ︙ | ︙ | |||
539 540 541 542 543 544 545 |
OF_INVALID_INIT_METHOD
}
- (instancetype)initWithBool: (bool)bool_
{
self = [super init];
| | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > | | > > | | > | < | | | | | | > > > > > > < < < < | < < < < < < < < < < | < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < | < < < < < | < < < < < | < < < < < | < < < < < < < < < | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < | < < < < < | | < < | < | | < < < < | < < < < < | < < < < < | > > > | < < | < | < < | 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 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 |
OF_INVALID_INIT_METHOD
}
- (instancetype)initWithBool: (bool)bool_
{
self = [super init];
_value.unsigned_ = bool_;
_type = OF_NUMBER_TYPE_UNSIGNED;
_typeEncoding = @encode(bool);
return self;
}
- (instancetype)initWithChar: (signed char)sChar
{
self = [super init];
_value.signed_ = sChar;
_type = OF_NUMBER_TYPE_SIGNED;
_typeEncoding = @encode(signed char);
return self;
}
- (instancetype)initWithShort: (short)sShort
{
self = [super init];
_value.signed_ = sShort;
_type = OF_NUMBER_TYPE_SIGNED;
_typeEncoding = @encode(short);
return self;
}
- (instancetype)initWithInt: (int)sInt
{
self = [super init];
_value.signed_ = sInt;
_type = OF_NUMBER_TYPE_SIGNED;
_typeEncoding = @encode(int);
return self;
}
- (instancetype)initWithLong: (long)sLong
{
self = [super init];
_value.signed_ = sLong;
_type = OF_NUMBER_TYPE_SIGNED;
_typeEncoding = @encode(long);
return self;
}
- (instancetype)initWithLongLong: (long long)sLongLong
{
self = [super init];
_value.signed_ = sLongLong;
_type = OF_NUMBER_TYPE_SIGNED;
_typeEncoding = @encode(long long);
return self;
}
- (instancetype)initWithUnsignedChar: (unsigned char)uChar
{
self = [super init];
_value.unsigned_ = uChar;
_type = OF_NUMBER_TYPE_UNSIGNED;
_typeEncoding = @encode(unsigned long);
return self;
}
- (instancetype)initWithUnsignedShort: (unsigned short)uShort
{
self = [super init];
_value.unsigned_ = uShort;
_type = OF_NUMBER_TYPE_UNSIGNED;
_typeEncoding = @encode(unsigned short);
return self;
}
- (instancetype)initWithUnsignedInt: (unsigned int)uInt
{
self = [super init];
_value.unsigned_ = uInt;
_type = OF_NUMBER_TYPE_UNSIGNED;
_typeEncoding = @encode(unsigned int);
return self;
}
- (instancetype)initWithUnsignedLong: (unsigned long)uLong
{
self = [super init];
_value.unsigned_ = uLong;
_type = OF_NUMBER_TYPE_UNSIGNED;
_typeEncoding = @encode(unsigned long);
return self;
}
- (instancetype)initWithUnsignedLongLong: (unsigned long long)uLongLong
{
self = [super init];
_value.unsigned_ = uLongLong;
_type = OF_NUMBER_TYPE_UNSIGNED;
_typeEncoding = @encode(unsigned long long);
return self;
}
- (instancetype)initWithInt8: (int8_t)int8
{
self = [super init];
_value.signed_ = int8;
_type = OF_NUMBER_TYPE_SIGNED;
_typeEncoding = @encode(int8_t);
return self;
}
- (instancetype)initWithInt16: (int16_t)int16
{
self = [super init];
_value.signed_ = int16;
_type = OF_NUMBER_TYPE_SIGNED;
_typeEncoding = @encode(int16_t);
return self;
}
- (instancetype)initWithInt32: (int32_t)int32
{
self = [super init];
_value.signed_ = int32;
_type = OF_NUMBER_TYPE_SIGNED;
_typeEncoding = @encode(int32_t);
return self;
}
- (instancetype)initWithInt64: (int64_t)int64
{
self = [super init];
_value.signed_ = int64;
_type = OF_NUMBER_TYPE_SIGNED;
_typeEncoding = @encode(int64_t);
return self;
}
- (instancetype)initWithUInt8: (uint8_t)uInt8
{
self = [super init];
_value.unsigned_ = uInt8;
_type = OF_NUMBER_TYPE_UNSIGNED;
_typeEncoding = @encode(uint8_t);
return self;
}
- (instancetype)initWithUInt16: (uint16_t)uInt16
{
self = [super init];
_value.unsigned_ = uInt16;
_type = OF_NUMBER_TYPE_UNSIGNED;
_typeEncoding = @encode(uint16_t);
return self;
}
- (instancetype)initWithUInt32: (uint32_t)uInt32
{
self = [super init];
_value.unsigned_ = uInt32;
_type = OF_NUMBER_TYPE_UNSIGNED;
_typeEncoding = @encode(uint32_t);
return self;
}
- (instancetype)initWithUInt64: (uint64_t)uInt64
{
self = [super init];
_value.unsigned_ = uInt64;
_type = OF_NUMBER_TYPE_UNSIGNED;
_typeEncoding = @encode(uint64_t);
return self;
}
- (instancetype)initWithSize: (size_t)size
{
self = [super init];
_value.unsigned_ = size;
_type = OF_NUMBER_TYPE_UNSIGNED;
_typeEncoding = @encode(size_t);
return self;
}
- (instancetype)initWithSSize: (ssize_t)sSize
{
self = [super init];
_value.signed_ = sSize;
_type = OF_NUMBER_TYPE_SIGNED;
_typeEncoding = @encode(ssize_t);
return self;
}
- (instancetype)initWithIntMax: (intmax_t)intMax
{
self = [super init];
_value.signed_ = intMax;
_type = OF_NUMBER_TYPE_SIGNED;
_typeEncoding = @encode(intmax_t);
return self;
}
- (instancetype)initWithUIntMax: (uintmax_t)uIntMax
{
self = [super init];
_value.unsigned_ = uIntMax;
_type = OF_NUMBER_TYPE_UNSIGNED;
_typeEncoding = @encode(uintmax_t);
return self;
}
- (instancetype)initWithPtrDiff: (ptrdiff_t)ptrDiff
{
self = [super init];
_value.signed_ = ptrDiff;
_type = OF_NUMBER_TYPE_SIGNED;
_typeEncoding = @encode(ptrdiff_t);
return self;
}
- (instancetype)initWithIntPtr: (intptr_t)intPtr
{
self = [super init];
_value.signed_ = intPtr;
_type = OF_NUMBER_TYPE_SIGNED;
_typeEncoding = @encode(intptr_t);
return self;
}
- (instancetype)initWithUIntPtr: (uintptr_t)uIntPtr
{
self = [super init];
_value.unsigned_ = uIntPtr;
_type = OF_NUMBER_TYPE_UNSIGNED;
_typeEncoding = @encode(uintptr_t);
return self;
}
- (instancetype)initWithFloat: (float)float_
{
self = [super init];
_value.float_ = float_;
_type = OF_NUMBER_TYPE_FLOAT;
_typeEncoding = @encode(float);
return self;
}
- (instancetype)initWithDouble: (double)double_
{
self = [super init];
_value.float_ = double_;
_type = OF_NUMBER_TYPE_FLOAT;
_typeEncoding = @encode(double);
return self;
}
- (instancetype)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: @"bool"]) {
OFString *stringValue = element.stringValue;
if ([stringValue isEqual: @"true"])
self = [self initWithBool: true];
else if ([stringValue isEqual: @"false"])
self = [self initWithBool: false];
else
@throw [OFInvalidArgumentException exception];
} else if ([typeString isEqual: @"float"])
self = [self initWithDouble: OF_BSWAP_DOUBLE_IF_LE(
OF_INT_TO_DOUBLE_RAW(OF_BSWAP64_IF_LE(
(uint64_t)element.hexadecimalValue)))];
else if ([typeString isEqual: @"signed"])
self = [self initWithIntMax: element.doubleValue];
else if ([typeString isEqual: @"unsigned"])
/*
* FIXME: This will fail if the value is bigger than
* INTMAX_MAX!
*/
self = [self initWithUIntMax: element.decimalValue];
else
@throw [OFInvalidArgumentException exception];
objc_autoreleasePoolPop(pool);
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (const char *)objCType
{
return _typeEncoding;
}
- (void)getValue: (void *)value
size: (size_t)size
{
switch (*_typeEncoding) {
#define CASE(enc, type, field) \
case enc: { \
type tmp = (type)_value.field; \
\
if (size != sizeof(type)) \
@throw [OFOutOfRangeException exception]; \
\
memcpy(value, &tmp, size); \
break; \
}
CASE('B', bool, unsigned_)
CASE('c', signed char, signed_)
CASE('s', short, signed_)
CASE('i', int, signed_)
CASE('l', long, signed_)
CASE('q', long long, signed_)
CASE('C', unsigned char, unsigned_)
CASE('S', unsigned short, unsigned_)
CASE('I', unsigned int, unsigned_)
CASE('L', unsigned long, unsigned_)
CASE('Q', unsigned long long, unsigned_)
CASE('f', float, float_)
CASE('d', double, float_)
#undef CASE
default:
@throw [OFInvalidFormatException exception];
}
}
- (bool)boolValue
{
|
| ︙ | ︙ | |||
1263 1264 1265 1266 1267 1268 1269 | return true; if (![object isKindOfClass: [OFNumber class]]) return false; number = object; | | | | | | | | | | 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 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 |
return true;
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 (![(id)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;
|
| ︙ | ︙ | |||
1329 1330 1331 1332 1333 1334 1335 |
return OF_ORDERED_SAME;
}
}
- (uint32_t)hash
{
| | < < < < < < < < < < < < < < < < < < < | | | | > < | < < | < < | < < < < < < < < < | < | < < < < < < < < < < < | | | < < < < < < < < < < < < < < < < | < | < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < | < < < < < < < < | | | > > > > | < | 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 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 |
return OF_ORDERED_SAME;
}
}
- (uint32_t)hash
{
enum of_number_type type = _type;
uint32_t hash;
OF_HASH_INIT(hash);
if (type == OF_NUMBER_TYPE_FLOAT) {
double d;
if (isnan(self.doubleValue))
return 0;
d = OF_BSWAP_DOUBLE_IF_BE(self.doubleValue);
for (uint_fast8_t i = 0; i < sizeof(double); i++)
OF_HASH_ADD(hash, ((char *)&d)[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;
}
OF_HASH_ADD(hash, 1);
} else if (type == OF_NUMBER_TYPE_UNSIGNED) {
uintmax_t v = self.uIntMaxValue;
while (v != 0) {
OF_HASH_ADD(hash, v & 0xFF);
v >>= 8;
}
} else
@throw [OFInvalidFormatException exception];
OF_HASH_FINALIZE(hash);
return hash;
}
- (id)copy
{
return [self retain];
}
- (OFString *)description
{
return [self stringValue];
}
- (OFString *)stringValue
{
if (*_typeEncoding == 'B')
return (_value.unsigned_ ? @"true" : @"false");
if (_type == OF_NUMBER_TYPE_FLOAT)
return [OFString stringWithFormat: @"%g", _value.float_];
if (_type == OF_NUMBER_TYPE_SIGNED)
return [OFString stringWithFormat: @"%jd", _value.signed_];
if (_type == OF_NUMBER_TYPE_UNSIGNED)
return [OFString stringWithFormat: @"%ju", _value.unsigned_];
@throw [OFInvalidFormatException exception];
}
- (OFXMLElement *)XMLElementBySerializing
{
void *pool = objc_autoreleasePoolPush();
OFXMLElement *element;
element = [OFXMLElement elementWithName: self.className
namespace: OF_SERIALIZATION_NS
stringValue: self.description];
if (*_typeEncoding == 'B')
[element addAttributeWithName: @"type"
stringValue: @"bool"];
else if (_type == OF_NUMBER_TYPE_FLOAT) {
[element addAttributeWithName: @"type"
stringValue: @"float"];
element.stringValue = [OFString
stringWithFormat: @"%016" PRIx64,
OF_BSWAP64_IF_LE(OF_DOUBLE_TO_INT_RAW(OF_BSWAP_DOUBLE_IF_LE(
_value.float_)))];
} else if (_type == OF_NUMBER_TYPE_SIGNED)
[element addAttributeWithName: @"type"
stringValue: @"signed"];
else if (_type == OF_NUMBER_TYPE_UNSIGNED)
[element addAttributeWithName: @"type"
stringValue: @"unsigned"];
else
@throw [OFInvalidFormatException exception];
[element retain];
objc_autoreleasePoolPop(pool);
return [element autorelease];
}
|
| ︙ | ︙ | |||
1543 1544 1545 1546 1547 1548 1549 |
}
- (OFString *)of_JSONRepresentationWithOptions: (int)options
depth: (size_t)depth
{
double doubleValue;
| | | | | | | | | | 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 |
}
- (OFString *)of_JSONRepresentationWithOptions: (int)options
depth: (size_t)depth
{
double doubleValue;
if (*_typeEncoding == 'B')
return (_value.unsigned_ ? @"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;
}
- (OFData *)messagePackRepresentation
{
OFMutableData *data;
if (*_typeEncoding == 'B') {
uint8_t type = (_value.unsigned_ ? 0xC3 : 0xC2);
data = [OFMutableData dataWithItems: &type
count: 1];
} else if (*_typeEncoding == 'f') {
uint8_t type = 0xCA;
float tmp = OF_BSWAP_FLOAT_IF_LE(_value.float_);
data = [OFMutableData dataWithItemSize: 1
capacity: 5];
[data addItem: &type];
[data addItems: &tmp
count: sizeof(tmp)];
} else if (*_typeEncoding == 'd') {
uint8_t type = 0xCB;
double tmp = OF_BSWAP_DOUBLE_IF_LE(_value.float_);
data = [OFMutableData dataWithItemSize: 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 = [OFMutableData dataWithItems: &tmp
count: 1];
|
| ︙ | ︙ | |||
1638 1639 1640 1641 1642 1643 1644 | capacity: 9]; [data addItem: &type]; [data addItems: &tmp count: sizeof(tmp)]; } else @throw [OFOutOfRangeException exception]; | | | 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 |
capacity: 9];
[data addItem: &type];
[data addItems: &tmp
count: sizeof(tmp)];
} else
@throw [OFOutOfRangeException exception];
} else if (_type == OF_NUMBER_TYPE_UNSIGNED) {
uintmax_t value = self.uIntMaxValue;
if (value <= 127) {
uint8_t tmp = ((uint8_t)value & 0x7F);
data = [OFMutableData dataWithItems: &tmp
count: 1];
|
| ︙ | ︙ | |||
1687 1688 1689 1690 1691 1692 1693 | capacity: 9]; [data addItem: &type]; [data addItems: &tmp count: sizeof(tmp)]; } else @throw [OFOutOfRangeException exception]; | | > | 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 | capacity: 9]; [data addItem: &type]; [data addItems: &tmp count: sizeof(tmp)]; } else @throw [OFOutOfRangeException exception]; } else @throw [OFInvalidFormatException exception]; [data makeImmutable]; return data; } @end |
Modified tests/serialization.xml from [4e889883e6] to [904cd48eb0].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 |
<OFString>data</OFString>
</object>
<key>
<OFArray>
<OFString>Qu"xbar
test</OFString>
<OFNumber type='unsigned'>1234</OFNumber>
| | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
<OFString>data</OFString>
</object>
<key>
<OFArray>
<OFString>Qu"xbar
test</OFString>
<OFNumber type='unsigned'>1234</OFNumber>
<OFNumber type='float'>40934a456d5cfaad</OFNumber>
<OFMutableString>asd</OFMutableString>
<OFDate>40934a456d5cfaad</OFDate>
</OFArray>
</key>
<object>
<OFString>Hello</OFString>
</object>
|
| ︙ | ︙ |