ObjFW  Diff

Differences From Artifact [1e5b23cc34]:

To Artifact [7eb8ab4a41]:


64
65
66
67
68
69
70












































































































71
72
73
74
75
76
77
		return (t)value.float_;					\
	case OF_NUMBER_DOUBLE:						\
		return (t)value.double_;				\
	default:							\
		@throw [OFInvalidFormatException newWithClass: isa];	\
		return 0;	/* Make gcc happy */			\
	}













































































































@implementation OFNumber
+ numberWithChar: (char)char_
{
	return [[[OFNumber alloc] initWithChar: char_] autorelease];
}








>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







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
		return (t)value.float_;					\
	case OF_NUMBER_DOUBLE:						\
		return (t)value.double_;				\
	default:							\
		@throw [OFInvalidFormatException newWithClass: isa];	\
		return 0;	/* Make gcc happy */			\
	}
#define CALCULATE(o)							\
	switch (type) {							\
	case OF_NUMBER_CHAR:						\
		value.char_ o;						\
	case OF_NUMBER_SHORT:						\
		value.short_ o;						\
	case OF_NUMBER_INT:						\
		value.int_ o;						\
	case OF_NUMBER_LONG:						\
		value.long_ o;						\
	case OF_NUMBER_UCHAR:						\
		value.uchar o;						\
	case OF_NUMBER_USHORT:						\
		value.ushort o;						\
	case OF_NUMBER_UINT:						\
		value.uint o;						\
	case OF_NUMBER_ULONG:						\
		value.ulong o;						\
	case OF_NUMBER_INT8:						\
		value.int8 o;						\
	case OF_NUMBER_INT16:						\
		value.int16 o;						\
	case OF_NUMBER_INT32:						\
		value.int32 o;						\
	case OF_NUMBER_INT64:						\
		value.int64 o;						\
	case OF_NUMBER_UINT8:						\
		value.uint8 o;						\
	case OF_NUMBER_UINT16:						\
		value.uint16 o;						\
	case OF_NUMBER_UINT32:						\
		value.uint32 o;						\
	case OF_NUMBER_UINT64:						\
		value.uint64 o;						\
	case OF_NUMBER_SIZE:						\
		value.size o;						\
	case OF_NUMBER_SSIZE:						\
		value.ssize o;						\
	case OF_NUMBER_INTMAX:						\
		value.intmax o;						\
	case OF_NUMBER_UINTMAX:						\
		value.uintmax o;					\
	case OF_NUMBER_PTRDIFF:						\
		value.ptrdiff o;					\
	case OF_NUMBER_INTPTR:						\
		value.intptr o;						\
	case OF_NUMBER_FLOAT:						\
		value.float_ o;						\
	case OF_NUMBER_DOUBLE:						\
		value.double_ o;					\
	default:							\
		@throw [OFInvalidFormatException newWithClass: isa];	\
		return nil;	/* make gcc happy */			\
	}
#define CALCULATE2(o, n)						\
	switch ([n type]) { 						\
	case OF_NUMBER_CHAR:						\
		value.char_ o [n asChar];				\
	case OF_NUMBER_SHORT:						\
		value.short_ o [n asShort];				\
	case OF_NUMBER_INT:						\
		value.int_ o [n asInt];					\
	case OF_NUMBER_LONG:						\
		value.long_ o [n asLong];				\
	case OF_NUMBER_UCHAR:						\
		value.uchar o [n asUChar];				\
	case OF_NUMBER_USHORT:						\
		value.ushort o [n asUShort];				\
	case OF_NUMBER_UINT:						\
		value.uint o [n asUInt];				\
	case OF_NUMBER_ULONG:						\
		value.ulong o [n asULong];				\
	case OF_NUMBER_INT8:						\
		value.int8 o [n asInt8];				\
	case OF_NUMBER_INT16:						\
		value.int16 o [n asInt16];				\
	case OF_NUMBER_INT32:						\
		value.int32 o [n asInt32];				\
	case OF_NUMBER_INT64:						\
		value.int64 o [n asInt64];				\
	case OF_NUMBER_UINT8:						\
		value.uint8 o [n asUInt8];				\
	case OF_NUMBER_UINT16:						\
		value.uint16 o [n asUInt16];				\
	case OF_NUMBER_UINT32:						\
		value.uint32 o [n asUInt32];				\
	case OF_NUMBER_UINT64:						\
		value.uint64 o [n asUInt64];				\
	case OF_NUMBER_SIZE:						\
		value.size o [n asSize];				\
	case OF_NUMBER_SSIZE:						\
		value.ssize o [n asSSize];				\
	case OF_NUMBER_INTMAX:						\
		value.intmax o [n asIntMax];				\
	case OF_NUMBER_UINTMAX:						\
		value.uintmax o [n asUIntMax];				\
	case OF_NUMBER_PTRDIFF:						\
		value.ptrdiff o [n asPtrDiff];				\
	case OF_NUMBER_INTPTR:						\
		value.intptr o [n asIntPtr];				\
	case OF_NUMBER_FLOAT:						\
		value.float_ o [n asFloat];				\
	case OF_NUMBER_DOUBLE:						\
		value.double_ o [n asDouble];				\
	default:							\
		@throw [OFInvalidFormatException newWithClass: isa];	\
		return nil;	/* make gcc happy */			\
	}

@implementation OFNumber
+ numberWithChar: (char)char_
{
	return [[[OFNumber alloc] initWithChar: char_] autorelease];
}

599
600
601
602
603
604
605




































606
	}
}

- (uint32_t)hash
{
	return [self asUInt32];
}




































@end







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>

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
	}
}

- (uint32_t)hash
{
	return [self asUInt32];
}

- add: (OFNumber*)num
{
	CALCULATE2(+=, num)
	return self;
}

- subtract: (OFNumber*)num
{
	CALCULATE2(-=, num)
	return self;
}

- multiplyWith: (OFNumber*)num
{
	CALCULATE2(*=, num)
	return self;
}

- divideBy: (OFNumber*)num
{
	CALCULATE2(/=, num)
	return self;
}

- increase
{
	CALCULATE(++)
	return self;
}

- decrease
{
	CALCULATE(--)
	return self;
}
@end