ObjFW  Diff

Differences From Artifact [57c5a42ed5]:

To Artifact [2892e2bc96]:


11
12
13
14
15
16
17
18
19
20
21
22
23
24


25
26
27
28
29
30
31
11
12
13
14
15
16
17

18
19
20
21
22

23
24
25
26
27
28
29
30
31







-





-
+
+







 * Public License, either version 2 or 3, which can be found in the file
 * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
 * file.
 */

#import "OFValue.h"
#import "OFBytesValue.h"
#import "OFDimensionValue.h"
#import "OFMethodSignature.h"
#import "OFNonretainedObjectValue.h"
#import "OFPointValue.h"
#import "OFPointerValue.h"
#import "OFRangeValue.h"
#import "OFRectangleValue.h"
#import "OFRectValue.h"
#import "OFSizeValue.h"
#import "OFString.h"

#import "OFOutOfMemoryException.h"

@implementation OFValue
+ (instancetype)alloc
{
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
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







-
+




-
+




-
+

-
+
-


-
+

-
+
-








+ (instancetype)valueWithNonretainedObject: (id)object
{
	return [[[OFNonretainedObjectValue alloc]
	    initWithNonretainedObject: object] autorelease];
}

+ (instancetype)valueWithRange: (of_range_t)range
+ (instancetype)valueWithRange: (OFRange)range
{
	return [[[OFRangeValue alloc] initWithRange: range] autorelease];
}

+ (instancetype)valueWithPoint: (of_point_t)point
+ (instancetype)valueWithPoint: (OFPoint)point
{
	return [[[OFPointValue alloc] initWithPoint: point] autorelease];
}

+ (instancetype)valueWithDimension: (of_dimension_t)dimension
+ (instancetype)valueWithSize: (OFSize)size
{
	return [[[OFDimensionValue alloc]
	return [[[OFSizeValue alloc] initWithSize: size] autorelease];
	    initWithDimension: dimension] autorelease];
}

+ (instancetype)valueWithRectangle: (of_rectangle_t)rectangle
+ (instancetype)valueWithRect: (OFRect)rect
{
	return [[[OFRectangleValue alloc]
	return [[[OFRectValue alloc] initWithRect: rect] autorelease];
	    initWithRectangle: rectangle] autorelease];
}

- (instancetype)initWithBytes: (const void *)bytes
		     objCType: (const char *)objCType
{
	OF_INVALID_INIT_METHOD
}
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
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







-
+

-
+

-
+

-
+








-
-
+
+







-
+

-
+

-
+



-
+


-
+

-
+

-
+







		return false;

	objCType = self.objCType;

	if (strcmp([object objCType], objCType) != 0)
		return false;

	size = of_sizeof_type_encoding(objCType);
	size = OFSizeOfTypeEncoding(objCType);

	value = of_alloc(1, size);
	value = OFAllocMemory(1, size);
	@try {
		otherValue = of_alloc(1, size);
		otherValue = OFAllocMemory(1, size);
	} @catch (id e) {
		free(value);
		OFFreeMemory(value);
		@throw e;
	}

	@try {
		[self getValue: value size: size];
		[object getValue: otherValue size: size];
		ret = (memcmp(value, otherValue, size) == 0);
	} @finally {
		free(value);
		free(otherValue);
		OFFreeMemory(value);
		OFFreeMemory(otherValue);
	}

	return ret;
}

- (unsigned long)hash
{
	size_t size = of_sizeof_type_encoding(self.objCType);
	size_t size = OFSizeOfTypeEncoding(self.objCType);
	unsigned char *value;
	uint32_t hash;
	unsigned long hash;

	value = of_alloc(1, size);
	value = OFAllocMemory(1, size);
	@try {
		[self getValue: value size: size];

		OF_HASH_INIT(hash);
		OFHashInit(&hash);

		for (size_t i = 0; i < size; i++)
			OF_HASH_ADD(hash, value[i]);
			OFHashAdd(&hash, value[i]);

		OF_HASH_FINALIZE(hash);
		OFHashFinalize(&hash);
	} @finally {
		free(value);
		OFFreeMemory(value);
	}

	return hash;
}

- (id)copy
{
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
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







-
+

+
+
+
+
+
+
+
-
+




-
+

-
+




-
-
-
-
-
-
-
+
-

-
+








-
+


-
+










-
+








- (id)nonretainedObjectValue
{
	id ret;
	[self getValue: &ret size: sizeof(ret)];
	return ret;
}

- (of_range_t)rangeValue
- (OFRange)rangeValue
{
	OFRange ret;
	[self getValue: &ret size: sizeof(ret)];
	return ret;
}

- (OFPoint)pointValue
{
	of_range_t ret;
	OFPoint ret;
	[self getValue: &ret size: sizeof(ret)];
	return ret;
}

- (of_point_t)pointValue
- (OFSize)sizeValue
{
	of_point_t ret;
	OFSize ret;
	[self getValue: &ret size: sizeof(ret)];
	return ret;
}

- (of_dimension_t)dimensionValue
{
	of_dimension_t ret;
	[self getValue: &ret size: sizeof(ret)];
	return ret;
}

- (OFRect)rectValue
- (of_rectangle_t)rectangleValue
{
	of_rectangle_t ret;
	OFRect ret;
	[self getValue: &ret size: sizeof(ret)];
	return ret;
}

- (OFString *)description
{
	OFMutableString *ret =
	    [OFMutableString stringWithString: @"<OFValue: "];
	size_t size = of_sizeof_type_encoding(self.objCType);
	size_t size = OFSizeOfTypeEncoding(self.objCType);
	unsigned char *value;

	value = of_alloc(1, size);
	value = OFAllocMemory(1, size);
	@try {
		[self getValue: value size: size];

		for (size_t i = 0; i < size; i++) {
			if (i > 0)
				[ret appendString: @" "];

			[ret appendFormat: @"%02x", value[i]];
		}
	} @finally {
		free(value);
		OFFreeMemory(value);
	}

	[ret appendString: @">"];

	[ret makeImmutable];
	return ret;
}
@end