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

Tidyup Fast stuff

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@4063 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-04-12 12:53:30 +00:00
parent a12bf80bd2
commit eb098ecf55
16 changed files with 1363 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Source/NSGSet.m
View file

@ -32,8 +32,9 @@
#include <Foundation/NSPortCoder.h>
#define FAST_MAP_HAS_VALUE 0
#define FAST_MAP_KTYPES GSUNION_OBJ
#include "FastMap.x"
#include <base/FastMap.x>
@class NSSetNonCore;
@class NSMutableSetNonCore;
@ -78,7 +79,7 @@
return nil;
}
node = node->nextInMap;
return old->key.o;
return old->key.obj;
}
- (void) dealloc
@ -121,7 +122,7 @@
[aCoder encodeValueOfObjCType: @encode(unsigned) at: &count];
while (node != 0)
{
(*imp)(aCoder, sel, node->key.o);
(*imp)(aCoder, sel, node->key.obj);
node = node->nextInMap;
}
}
@ -145,7 +146,7 @@
while (count-- > 0)
{
(*imp)(aCoder, sel, type, &value);
FastMapAddKeyNoRetain(&map, (FastMapItem)value);
FastMapAddKeyNoRetain(&map, (FastMapKey)value);
}
return self;
@ -167,10 +168,10 @@
[NSException raise: NSInvalidArgumentException
format: @"Tried to init set with nil value"];
}
node = FastMapNodeForKey(&map, (FastMapItem)objs[i]);
node = FastMapNodeForKey(&map, (FastMapKey)objs[i]);
if (node == 0)
{
FastMapAddKey(&map, (FastMapItem)objs[i]);
FastMapAddKey(&map, (FastMapKey)objs[i]);
}
}
return self;
@ -180,11 +181,11 @@
{
if (anObject)
{
FastMapNode node = FastMapNodeForKey(&map, (FastMapItem)anObject);
FastMapNode node = FastMapNodeForKey(&map, (FastMapKey)anObject);
if (node)
{
return node->key.o;
return node->key.obj;
}
}
return nil;
@ -224,10 +225,10 @@
[NSException raise: NSInvalidArgumentException
format: @"Tried to add nil to set"];
}
node = FastMapNodeForKey(&map, (FastMapItem)anObject);
node = FastMapNodeForKey(&map, (FastMapKey)anObject);
if (node == 0)
{
FastMapAddKey(&map, (FastMapItem)anObject);
FastMapAddKey(&map, (FastMapKey)anObject);
}
}
@ -235,7 +236,7 @@
{
if (anObject)
{
FastMapRemoveKey(&map, (FastMapItem)anObject);
FastMapRemoveKey(&map, (FastMapKey)anObject);
}
}