ObjFW  Diff

Differences From Artifact [953bd32ef3]:

• File src/OFSet_hashtable.m — part of check-in [eceebefeab] at 2013-06-17 08:44:30 on branch trunk — Rename -[OFDataArray readDataArrayWithSize:].

  It is now called -[readDataArrayWithCount:]. (user: js, size: 6174) [annotate] [blame] [check-ins using]

To Artifact [d36729b45c]:

• File src/OFSet_hashtable.m — part of check-in [3d16a30f41] at 2013-06-22 12:12:36 on branch trunk — Rework exceptions.

  This mostly removes the argument for the class in which the exception
  occurred. As backtraces were recently added for all platforms, the
  passed class does not give any extra information on where the exception
  occurred anymore.

  This also removes a few other arguments which were not too helpful. In
  the past, the idea was to pass as many arguments as possible so that it
  is easier to find the origin of the exception. However, as backtraces
  are a much better way to find the origin, those are not useful anymore
  and just make the exception more cumbersome to use. The rule is now to
  only pass arguments that might help in recovering from the exception or
  provide information that is otherwise not easily accessible. (user: js, size: 6095) [annotate] [blame] [check-ins using]

214
215
216
217
218
219
220
221

222
223
224
225
226
227
228
229
230

214
215
216
217
218
219
220

221


222
223
224
225
226
227
228

-
+
-
-

		void *pool = objc_autoreleasePoolPush();
		OFEnumerator *enumerator;
		OFXMLElement *child;

		if ((![[element name] isEqual: @"OFSet"] &&
		    ![[element name] isEqual: @"OFMutableSet"]) ||
		    ![[element namespace] isEqual: OF_SERIALIZATION_NS])
			@throw [OFInvalidArgumentException
			@throw [OFInvalidArgumentException exception];
			    exceptionWithClass: [self class]
				      selector: _cmd];

		enumerator = [[element elementsForNamespace:
		    OF_SERIALIZATION_NS] objectEnumerator];
		while ((child = [enumerator nextObject]) != nil) {
			void *pool2  = objc_autoreleasePoolPush();

			[_mapTable setValue: (void*)1

311
312
313
314
315
316
317
318
319

320
321
322
323

309
310
311
312
313
314
315


316
317
318
319
320

-
-
+

	@try {
		[_mapTable enumerateKeysAndValuesUsingBlock:
		    ^ (void *key, void *value, bool *stop) {
			block(key, stop);
		}];
	} @catch (OFEnumerationMutationException *e) {
		@throw [OFEnumerationMutationException
		    exceptionWithClass: [self class]
				object: self];
		    exceptionWithObject: self];
	}
}
#endif
@end