ObjFW  Check-in [09d6e5b6da]

Overview
Comment:Improve autoreleasing blocks.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 09d6e5b6da7807b978d8f6790e6a9648b2cb01a8b8ae925c685816562266f35f
User & Date: js on 2010-11-12 13:37:51
Other Links: manifest | tags
Context
2010-11-12
14:06
More compatibility with other blocks runtimes. check-in: c0863afedf user: js tags: trunk
13:37
Improve autoreleasing blocks. check-in: 09d6e5b6da user: js tags: trunk
2010-11-11
22:46
Fix a typo in configure.ac. check-in: f060cc04eb user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/OFBlock.m from [e3fe4dcc30] to [922e8efbd5].

︙︙
292
293
294
295
296
297
298








299
300
301
302
303
304
305

	return self;
}

- copy
{
	return Block_copy(self);
}









- (size_t)retainCount
{
	if (isa == (Class)&_NSConcreteMallocBlock)
		return ((of_block_literal_t*)self)->reserved;

	return SIZE_MAX;








>
>
>
>
>
>
>
>








292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313

	return self;
}

- copy
{
	return Block_copy(self);
}

- autorelease
{
	if (isa == (Class)&_NSConcreteMallocBlock)
		return [super autorelease];

	return self;
}

- (size_t)retainCount
{
	if (isa == (Class)&_NSConcreteMallocBlock)
		return ((of_block_literal_t*)self)->reserved;

	return SIZE_MAX;
︙︙

Modified src/OFXMLParser.m from [54f1adaa82] to [686f9660a5].

︙︙
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
272
273
274
275
276
277
278
279
280
281

	[(id)delegate release];
	delegate = delegate_;
}

#ifdef OF_HAVE_BLOCKS
- (of_xml_parser_element_start_block_t)elementStartHandler
{
	of_xml_parser_element_start_block_t block = [elementStartHandler copy];
	[OFAutoreleasePool addObject: block];

	return block;
}

- (void)setElementStartHandler: (of_xml_parser_element_start_block_t)block
{
	block = [block copy];
	[elementStartHandler release];
	elementStartHandler = block;
}

- (of_xml_parser_element_end_block_t)elementEndHandler
{
	of_xml_parser_element_end_block_t block = [elementEndHandler copy];
	[OFAutoreleasePool addObject: block];

	return block;
}

- (void)setElementEndHandler: (of_xml_parser_element_end_block_t)block
{
	block = [block copy];
	[elementEndHandler release];
	elementEndHandler = block;
}

- (of_xml_parser_string_block_t)charactersHandler
{
	of_xml_parser_string_block_t block = [charactersHandler copy];
	[OFAutoreleasePool addObject: block];

	return block;
}

- (void)setCharactersHandler: (of_xml_parser_string_block_t)block
{
	block = [block copy];
	[charactersHandler release];
	charactersHandler = block;
}

- (of_xml_parser_string_block_t)CDATAHandler
{
	of_xml_parser_string_block_t block = [CDATAHandler copy];
	[OFAutoreleasePool addObject: block];

	return block;
}

- (void)setCDATAHandler: (of_xml_parser_string_block_t)block
{
	block = [block copy];
	[CDATAHandler release];
	CDATAHandler = block;
}

- (of_xml_parser_string_block_t)commentHandler
{
	of_xml_parser_string_block_t block = [commentHandler copy];
	[OFAutoreleasePool addObject: block];

	return block;
}

- (void)setCommentHandler: (of_xml_parser_string_block_t)block
{
	block = [block copy];
	[commentHandler release];
	commentHandler = block;
}

- (of_xml_parser_unknown_entity_block_t)unknownEntityHandler
{
	of_xml_parser_unknown_entity_block_t block;

	block = [unknownEntityHandler copy];
	[OFAutoreleasePool addObject: block];

	return block;
}

- (void)setUnknownEntityHandler: (of_xml_parser_unknown_entity_block_t)block
{
	block = [block copy];
	[unknownEntityHandler release];
	unknownEntityHandler = block;








|
<
<
<











|
<
<
<











|
<
<
<











<
<
<
|











|
<
<
<











<
<
|
<
<
<








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

	[(id)delegate release];
	delegate = delegate_;
}

#ifdef OF_HAVE_BLOCKS
- (of_xml_parser_element_start_block_t)elementStartHandler
{
	return [[elementStartHandler copy] autorelease];



}

- (void)setElementStartHandler: (of_xml_parser_element_start_block_t)block
{
	block = [block copy];
	[elementStartHandler release];
	elementStartHandler = block;
}

- (of_xml_parser_element_end_block_t)elementEndHandler
{
	return [[elementEndHandler copy] autorelease];



}

- (void)setElementEndHandler: (of_xml_parser_element_end_block_t)block
{
	block = [block copy];
	[elementEndHandler release];
	elementEndHandler = block;
}

- (of_xml_parser_string_block_t)charactersHandler
{
	return [[charactersHandler copy] autorelease];



}

- (void)setCharactersHandler: (of_xml_parser_string_block_t)block
{
	block = [block copy];
	[charactersHandler release];
	charactersHandler = block;
}

- (of_xml_parser_string_block_t)CDATAHandler
{



	return [[CDATAHandler copy] autorelease];
}

- (void)setCDATAHandler: (of_xml_parser_string_block_t)block
{
	block = [block copy];
	[CDATAHandler release];
	CDATAHandler = block;
}

- (of_xml_parser_string_block_t)commentHandler
{
	return [[commentHandler copy] autorelease];



}

- (void)setCommentHandler: (of_xml_parser_string_block_t)block
{
	block = [block copy];
	[commentHandler release];
	commentHandler = block;
}

- (of_xml_parser_unknown_entity_block_t)unknownEntityHandler
{


	return [[unknownEntityHandler copy] autorelease];



}

- (void)setUnknownEntityHandler: (of_xml_parser_unknown_entity_block_t)block
{
	block = [block copy];
	[unknownEntityHandler release];
	unknownEntityHandler = block;
︙︙