ObjFW  Diff

Differences From Artifact [09953b1423]:

To Artifact [37d0e0f0dd]:


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
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
1
2
3
4
5
6
7
8
9
10
11
12
13





14
15

16



17

18
19

20
21
22






23
24


25









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













-
-
-
-
-


-

-
-
-

-
+

-
+


-
-
-
-
-
-
+

-
-

-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
-
-
-
+
-
-
-
-
-
+
-
-
-
-
-
-
+
+
-
-
-
-
+
-
-
-
-
-
+
+
-
-

-
-
-
+


-
-
-
-
-
+
-
-
-
-
+
-
-
-
+


-
-
+

-
-
-
+
-
-
-
-
-
+
+
-

-
-
-
+
-
-
-
+
-

-
-
-
-
+
-
-
+
-
-
-
+
+
-
-
-
-
+
-
-



-
-
-
-
-
-
+
-
-
+
-
-
-
+
+


-
+

-
-
+
+
-
-
-
-
-
-

-
-
-
+
-
-
-
-
+
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+

-

-
-
+

-
-
+
-
-
-
+

-
-
-
-
+
+
-
-

-
+


-
-
+
-
-
-
+

-
+
-




-
-
-
-
-
+
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+

-
+
-
-
+
-
-
+
-
-
-

-
-
-
+
+
-
-
-
+
+
-
-
-
-
+
-
-

-
+


/*
 * Copyright (c) 2008 - 2009
 *   Jonathan Schleifer <js@webkeks.org>
 *
 * All rights reserved.
 *
 * This file is part of libobjfw. It may be distributed under the terms of the
 * Q Public License 1.0, which can be found in the file LICENSE included in
 * the packaging of this file.
 */

#import "config.h"

#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <limits.h>

#import "OFArray.h"
#import "OFExceptions.h"
#import "OFMacros.h"

static size_t lastpagebyte = 0;
extern int getpagesize(void);

@implementation OFArray
+ arrayWithItemSize: (size_t)is
+ array
{
	return [[[OFArray alloc] initWithItemSize: is] autorelease];
	return [[[OFArray alloc] init] autorelease];
}

+ bigArrayWithItemSize: (size_t)is
{
	return [[[OFBigArray alloc] initWithItemSize: is] autorelease];
}

- initWithItemSize: (size_t)is
- init
{
	Class c;

	self = [super init];

	if (is == 0) {
		c = isa;
		[super free];
		@throw [OFInvalidArgumentException newWithClass: c];
	}

	data = NULL;
	itemsize = is;

	@try {
		array = [[OFDataArray alloc]
		    initWithItemSize: sizeof(OFObject*)];
	items = 0;

	} @catch (OFException *e) {
	return self;
}

		/*
- (size_t)items
{
	return items;
}

		 * We can't use [super free] on OS X here. Compiler bug?
- (size_t)itemsize
{
	return itemsize;
}

- (void*)data
		 * [self free] will do here as we check for nil in free.
		 */
{
	return data;
}

		[self free];
- (void*)item: (size_t)item
{
	if (item >= items)
		@throw [OFOutOfRangeException newWithClass: isa];

		@throw e;
	}
	return data + item * itemsize;
}

- (void*)last
{
	return data + (items - 1) * itemsize;
	return self;
}

- add: (void*)item
{
	if (SIZE_MAX - items < 1)
		@throw [OFOutOfRangeException newWithClass: isa];

- (size_t)objects
	data = [self resizeMem: data
		      toNItems: items + 1
		      withSize: itemsize];

{
	memcpy(data + items++ * itemsize, item, itemsize);

	return self;
	return [array items];
}

- addNItems: (size_t)nitems
 fromCArray: (void*)carray
- (id)copy
{
	if (nitems > SIZE_MAX - items)
		@throw [OFOutOfRangeException newWithClass: isa];

	OFArray *new = [OFArray array];
	data = [self resizeMem: data
		      toNItems: items + nitems
		      withSize: itemsize];

	memcpy(data + items * itemsize, carray, nitems * itemsize);
	OFObject **objs;
	size_t len, i;
	items += nitems;

	return self;
}

	objs = [array data];
- removeNItems: (size_t)nitems
{
	if (nitems > items)
	len = [array items];
		@throw [OFOutOfRangeException newWithClass: isa];

	data = [self resizeMem: data
		      toNItems: items - nitems
		      withSize: itemsize];

	[new->array addNItems: len
	items -= nitems;

		   fromCArray: objs];
	return self;
}


	for (i = 0; i < len; i++)
- (id)copy
{
	OFArray *new = [OFArray arrayWithItemSize: itemsize];

		[objs[i] retain];
	[new addNItems: items
	    fromCArray: data];

	return new;
}

- (BOOL)isEqual: (id)obj
{
	if (![obj isKindOf: [OFArray class]])
		return NO;
	if ([obj items] != items || [obj itemsize] != itemsize)

		return NO;
	if (memcmp([obj data], data, items * itemsize))
- (OFObject*)object: (size_t)index
		return NO;

	return YES;
{
	return *((OFObject**)[array item: index]);
}

- (int)compare: (id)obj
- (OFObject*)last
{
	int ret;

	return *((OFObject**)[array last]);
}
	if (![obj isKindOf: [OFArray class]])
		@throw [OFInvalidArgumentException newWithClass: isa
						    andSelector: _cmd];
	if ([obj itemsize] != itemsize)
		@throw [OFInvalidArgumentException newWithClass: isa
						    andSelector: _cmd];

	if ([obj items] == items)
		return memcmp(data, [obj data], items * itemsize);

- add: (OFObject*)obj
	if (items > [obj items]) {
		if ((ret = memcmp(data, [obj data], [obj items] * itemsize)))
			return ret;

{
		return *(char*)[self item: [obj items]];
	} else {
		if ((ret = memcmp(data, [obj data], items * itemsize)))
			return ret;

		return *(char*)[obj item: [self items]] * -1;
	}
	[array add: &obj];
	[obj retain];

}

- (uint32_t)hash
{
	uint32_t hash;
	size_t i;

	OF_HASH_INIT(hash);
	for (i = 0; i < items * itemsize; i++)
		OF_HASH_ADD(hash, ((char*)data)[i]);
	OF_HASH_FINALIZE(hash);

	return hash;
	return self;
}
@end

@implementation OFBigArray
- initWithItemSize: (size_t)is
- removeNObjects: (size_t)nobjects
{
	self = [super initWithItemSize: is];

	OFObject **objs;
	if (lastpagebyte == 0)
		lastpagebyte = getpagesize() - 1;
	size = 0;
	size_t len, i;

	return self;
}

- add: (void*)item
	objs = [array data];
	len = [array items];
{
	size_t nsize;

	if (SIZE_MAX - items < 1 || items + 1 > SIZE_MAX / itemsize)
	if (nobjects > len)
		@throw [OFOutOfRangeException newWithClass: isa];

	nsize = ((items + 1) * itemsize + lastpagebyte) & ~lastpagebyte;

	for (i = len - nobjects; i < len; i++)
	if (size != nsize)
		data = [self resizeMem: data
				toSize: nsize];
		[objs[i] release];

	memcpy(data + items++ * itemsize, item, itemsize);
	[array removeNItems: nobjects];
	size = nsize;

	return self;
}

- addNItems: (size_t)nitems
 fromCArray: (void*)carray
{
	size_t nsize;

- free
	if (nitems > SIZE_MAX - items || items + nitems > SIZE_MAX / itemsize)
		@throw [OFOutOfRangeException newWithClass: isa];

{
	nsize = ((items + nitems) * itemsize + lastpagebyte) & ~lastpagebyte;

	OFObject **objs;
	if (size != nsize)
		data = [self resizeMem: data
				toSize: nsize];

	memcpy(data + items * itemsize, carray, nitems * itemsize);
	items += nitems;
	size = nsize;

	return self;
}

- removeNItems: (size_t)nitems
{
	size_t nsize;
	size_t len, i;

	if (nitems > items)
	if (array != nil) {
		@throw [OFOutOfRangeException newWithClass: isa];

		objs = [array data];
	nsize = ((items - nitems) * itemsize + lastpagebyte) & ~lastpagebyte;

		len = [array items];
	if (size != nsize)
		data = [self resizeMem: data
				toSize: nsize];

	items -= nitems;
	size = nsize;

		for (i = 0; i < len; i++)
			[objs[i] release];
	return self;
}


		[array release];
- (id)copy
{
	OFArray *new = [OFArray bigArrayWithItemSize: itemsize];

	}
	[new addNItems: items
	    fromCArray: data];

	return new;
	return [super free];
}
@end