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

Overhaul for new collection class scheme to improve distributed objects and NeXT-compatibility.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@940 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mccallum 1996-02-22 15:11:43 +00:00
parent 72114c01b0
commit 9c3783b952
52 changed files with 1839 additions and 2931 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Source/SplayTree.m
View file

@ -1,5 +1,5 @@
/* Implementation for Objective-C SplayTree collection object
Copyright (C) 1993,1994 Free Software Foundation, Inc.
Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc.
Written by: R. Andrew McCallum <mccallum@gnu.ai.mit.edu>
Date: May 1993
@ -26,14 +26,8 @@
@implementation SplayTree
+ (void) initialize
{
if (self == [SplayTree class])
[self setVersion:0]; /* beta release */
}
/* Make this a function ? */
- _doSplayOperationOnNode: aNode
- (void) _doSplayOperationOnNode: aNode
{
id parent = [aNode parentNode];
id parentRightChild =
@ -41,7 +35,7 @@
if (aNode == _contents_root || aNode == [self nilNode])
{
return self;
return;
}
else if (aNode == parentRightChild)
{
@ -80,53 +74,28 @@
[self leftRotateAroundNode:[aNode parentNode]];
}
}
return self;
}
- splayNode: aNode
- (void) splayNode: aNode
{
while (aNode != _contents_root)
[self _doSplayOperationOnNode:aNode];
return self;
}
/* We could make this a little more efficient by doing the splay as
we search down the tree for the correct insertion point. */
- sortAddElement: (elt)newElement byCalling: (int(*)(elt,elt))aFunc
- (void) sortAddObject: newObject
{
[super sortAddElement:newElement byCalling:aFunc];
[self splayNode:newElement.id_u];
return self;
[super sortAddObject: newObject];
[self splayNode: newObject];
}
- insertElement: (elt)newElement before: (elt)oldElement
- (void) removeObject: anObject
{
[super insertElement:newElement before:oldElement];
// ?? [self splayNode:newElement.id_u];
return self;
}
- insertElement: (elt)newElement after: (elt)oldElement
{
[super insertElement:newElement after:oldElement];
// ?? [self splayNode:newElement.id_u];
return self;
}
- insertElement: (elt)newElement atIndex: (unsigned)index
{
[super insertElement:newElement atIndex:index];
// ?? [self splayNode:newElement.id_u];
return self;
}
- (elt) removeElement: (elt)anElement
{
id parent = [anElement.id_u parentNode];
[super removeElement:anElement];
id parent = [anObject parentNode];
[super removeObject: anObject];
if (parent && parent != [self nilNode])
[self splayNode:parent];
return AUTORELEASE_ELT(anElement);
}
@end