From 200eb65dff0ba9281f0f80009792dd83fc7be2cb Mon Sep 17 00:00:00 2001 From: richard Date: Thu, 1 Oct 1998 16:04:10 +0000 Subject: [PATCH] Backup of original dictionary code git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3006 72102866-910b-0410-8b05-ffd578937521 --- Source/NSGDictionary.m.old | 146 +++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 Source/NSGDictionary.m.old diff --git a/Source/NSGDictionary.m.old b/Source/NSGDictionary.m.old new file mode 100644 index 000000000..5ceec7815 --- /dev/null +++ b/Source/NSGDictionary.m.old @@ -0,0 +1,146 @@ +/* Concrete implementation of NSDictionary based on GNU Dictionary class + Copyright (C) 1995, 1996 Free Software Foundation, Inc. + + Written by: Andrew Kachites McCallum + Created: April 1995 + + This file is part of the GNUstep Base Library. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include +#include +#include + +@interface NSGDictionary : NSDictionary +@end + +@interface NSGMutableDictionary : NSMutableDictionary +@end + +@class NSDictionaryNonCore; +@class NSMutableDictionaryNonCore; + +@interface NSGDictionaryKeyEnumerator : NSEnumerator +{ + NSDictionary *dictionary; + void *enum_state; +} +@end + +@implementation NSGDictionaryKeyEnumerator + +- initWithDictionary: (NSDictionary*)d +{ + [super init]; + dictionary = d; + [dictionary retain]; + enum_state = 0; + return self; +} + +- nextObject +{ + id k; + [dictionary nextObjectAndKey: &k withEnumState: &enum_state]; + return k; +} + +- (void) dealloc +{ + [dictionary release]; + [super dealloc]; +} + +@end + +@interface NSGDictionaryObjectEnumerator : NSGDictionaryKeyEnumerator +@end + +@implementation NSGDictionaryObjectEnumerator + +- nextObject +{ + id k; + [dictionary nextObjectAndKey: &k withEnumState: &enum_state]; + return k; +} + +@end + + +@implementation NSGDictionary + ++ (void) initialize +{ + if (self == [NSGDictionary class]) + { + behavior_class_add_class (self, [NSDictionaryNonCore class]); + behavior_class_add_class (self, [Dictionary class]); + } +} + +- objectForKey: aKey +{ + /* xxx Should I change the method name in Dictionary? + I don't really want to; I think "at" is better. */ + return [self objectAtKey: aKey]; +} + +/* + Comes from Dictionary.m + - initWithObjects: (id*)objects + forKeys: (NSObject**)keys + count: (unsigned)count + - (unsigned) count + - (NSEnumerator*) keyEnumerator + - (NSEnumerator*) objectEnumerator + */ + +@end + +@implementation NSGMutableDictionary + ++ (void) initialize +{ + if (self == [NSGMutableDictionary class]) + { + behavior_class_add_class (self, [NSMutableDictionaryNonCore class]); + behavior_class_add_class (self, [NSGDictionary class]); + behavior_class_add_class (self, [Dictionary class]); + } +} + + +/* This is the designated initializer */ +/* Comes from Dictionary.m + - initWithCapacity: (unsigned)numItems + */ + +- (void) setObject:anObject forKey:(NSObject *)aKey +{ + [self putObject: anObject atKey: aKey]; +} + +- (void) removeObjectForKey:(NSObject *)aKey +{ + [self removeObjectAtKey: aKey]; +} + +@end