gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 08:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactored last two commits so that all of the real code is in GSIMap.h and is just called from the relevant classes, rather than copied and pasted everywhere. Also added fast enumeration support to GSCountedSet.

Browse source 
I think that's all of the classes that use GSIMaps for their implementation now fully supporting fast enumeration.  If there are any that I've missed, then just copy the methods from GSSet to implement them.  You just need to set the mutations pointer to something sensible (i.e. something that will change if the collection mutates) and then call the new GSIMapCountByEnumeratingWithStateObjectsCount() function.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29181 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Chisnall 2009-12-29 16:49:07 +00:00
parent 9e003700b4
commit c5103403f6
5 changed files with 97 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

98
Source/GSDictionary.m
View file

@ -358,53 +358,8 @@ static SEL objSel;
objects: (id*)stackbuf
count: (NSUInteger)len
{
NSInteger count;
NSInteger i;
/* This is cached in the caller at the start and compared at each
* iteration. If it changes during the iteration then
* objc_enumerationMutation() will be called, throwing an exception.
*/
state->mutationsPtr = (unsigned long *)self;
count = MIN(len, map.nodeCount - state->state);
/* We can store a GSIMapEnumerator inside the extra buffer in state on all
* platforms that don't suck beyond belief (i.e. everything except win64),
* but we can't on anything where long is 32 bits and pointers are 64 bits,
* so we have to construct it here to avoid breaking on that platform.
*/
struct GSPartMapEnumerator
{
GSIMapNode node;
uintptr_t bucket;
};
GSIMapEnumerator_t enumerator;
/* Construct the real enumerator */
enumerator.map = ↦
if (0 == state->state)
{
enumerator = GSIMapEnumeratorForMap(&map);
}
else
{
enumerator.node = ((struct GSPartMapEnumerator*)&(state->extra))->node;
enumerator.bucket = ((struct GSPartMapEnumerator*)&(state->extra))->bucket;
}
/* Get the next count objects and put them in the stack buffer. */
for (i=0 ; i<count ; i++)
{
GSIMapNode node = GSIMapEnumeratorNextNode(&enumerator);
if (0 != node)
{
stackbuf[i] = node->key.obj;
}
}
/* Store the important bits of the enumerator in the caller. */
((struct GSPartMapEnumerator*)&(state->extra))->node = enumerator.node;
((struct GSPartMapEnumerator*)&(state->extra))->bucket = enumerator.bucket;
/* Update the rest of the state. */
state->state += count;
state->itemsPtr = stackbuf;
return count;
state->mutationsPtr = (unsigned long *)self;
return GSIMapCountByEnumeratingWithStateObjectsCount(&map, state, stackbuf, len);
}
@end
@ -513,53 +468,8 @@ static SEL objSel;
objects: (id*)stackbuf
count: (NSUInteger)len
{
NSInteger count;
NSInteger i;
/* This is cached in the caller at the start and compared at each
* iteration. If it changes during the iteration then
* objc_enumerationMutation() will be called, throwing an exception.
*/
state->mutationsPtr = (unsigned long *)&_version;
count = MIN(len, map.nodeCount - state->state);
/* We can store a GSIMapEnumerator inside the extra buffer in state on all
* platforms that don't suck beyond belief (i.e. everything except win64),
* but we can't on anything where long is 32 bits and pointers are 64 bits,
* so we have to construct it here to avoid breaking on that platform.
*/
struct GSPartMapEnumerator
{
GSIMapNode node;
uintptr_t bucket;
};
GSIMapEnumerator_t enumerator;
/* Construct the real enumerator */
enumerator.map = &map;
if (0 == state->state)
{
enumerator = GSIMapEnumeratorForMap(&map);
}
else
{
enumerator.node = ((struct GSPartMapEnumerator*)&(state->extra))->node;
enumerator.bucket = ((struct GSPartMapEnumerator*)&(state->extra))->bucket;
}
/* Get the next count objects and put them in the stack buffer. */
for (i=0 ; i<count ; i++)
{
GSIMapNode node = GSIMapEnumeratorNextNode(&enumerator);
if (0 != node)
{
stackbuf[i] = node->key.obj;
}
}
/* Store the important bits of the enumerator in the caller. */
((struct GSPartMapEnumerator*)&(state->extra))->node = enumerator.node;
((struct GSPartMapEnumerator*)&(state->extra))->bucket = enumerator.bucket;
/* Update the rest of the state. */
state->state += count;
state->itemsPtr = stackbuf;
return count;
state->mutationsPtr = (unsigned long *)&_version;
return GSIMapCountByEnumeratingWithStateObjectsCount(&map, state, stackbuf, len);
}
@end