ObjFW  Diff

Differences From Artifact [74e169c6cb]:

To Artifact [c6cdd10ae1]:


87
88
89
90
91
92
93
94
95







96
97
98
99
100
101
102
103







104
105
106
107
108
109
110
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







-
-
+
+
+
+
+
+
+





-
-
-
+
+
+
+
+
+
+







	if (key == nil || obj == nil)
		@throw [OFInvalidArgumentException newWithClass: isa
						       selector: _cmd];

	hash = [key hash];
	last = size;

	for (i = hash & (size - 1); i < last && data[i].key != nil &&
	    (data[i].key == DELETED || ![data[i].key isEqual: key]); i++);
	for (i = hash & (size - 1); i < last && data[i].key != nil; i++) {
		if (data[i].key == DELETED)
			continue;

		if ([data[i].key isEqual: key])
			break;
	}

	/* In case the last bucket is already used */
	if (i >= last) {
		last = hash & (size - 1);

		for (i = 0; i < last && data[i].key != nil &&
		    (data[i].key == DELETED || ![data[i].key isEqual: key]);
		    i++);
		for (i = 0; i < last && data[i].key != nil; i++) {
			if (data[i].key == DELETED)
				continue;

			if ([data[i].key isEqual: key])
				break;
		}
	}

	/* Key not in dictionary */
	if (i >= last || data[i].key == nil || data[i].key == DELETED ||
	    ![data[i].key isEqual: key]) {
		[self _resizeForCount: count + 1];

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







-
-
+
+
+

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

-
-
+

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

-
-
-
+
+
+
+
+
+
+







	if (key == nil)
		@throw [OFInvalidArgumentException newWithClass: isa
						       selector: _cmd];

	hash = [key hash];
	last = size;

	for (i = hash & (size - 1); i < last && data[i].key != nil &&
	    (data[i].key == DELETED || ![data[i].key isEqual: key]); i++);
	for (i = hash & (size - 1); i < last && data[i].key != nil; i++) {
		if (data[i].key == DELETED)
			continue;

	if (i < last && (data[i].key == nil || data[i].key == DELETED ||
	    ![data[i].key isEqual: key]))
		return self;

		if ([data[i].key isEqual: key]) {
			[data[i].key release];
			[data[i].object release];
			data[i].key = DELETED;

			count--;
			mutations++;
			[self _resizeForCount: count];

			return self;
		}
	}

	if (i < last)
		return self;

	/* In case the last bucket is already used */
	if (i >= last) {
		last = hash & (size - 1);
	last = hash & (size - 1);

		for (i = 0; i < last && data[i].key != nil &&
		    (data[i].key == DELETED || ![data[i].key isEqual: key]);
		    i++);
	}
	for (i = 0; i < last && data[i].key != nil; i++) {
		if (data[i].key == DELETED)
			continue;


	/* Key not in dictionary */
	if (i >= last || data[i].key == nil || data[i].key == DELETED ||
	    ![data[i].key isEqual: key])
		if ([data[i].key isEqual: key]) {
		return self;

	[data[i].key release];
	[data[i].object release];
	data[i].key = DELETED;
			[data[i].key release];
			[data[i].object release];
			data[i].key = DELETED;

	count--;
	mutations++;
	[self _resizeForCount: count];
			count--;
			mutations++;
			[self _resizeForCount: count];

			return self;
		}
	}

	return self;
}

- (id)copy
{
	return [[OFDictionary alloc] initWithDictionary: self];