Filled out skeleton. Most methods now implemented.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@413 72102866-910b-0410-8b05-ffd578937521

Source/NSDictionary.m

@@ -1,7 +1,8 @@
 /* NSDictionary - Dictionary object to store key/value pairs
-   Copyright (C) 1993,1994 Free Software Foundation, Inc.
+   Copyright (C) 1995 Free Software Foundation, Inc.
    
-   Written by:  Adam Fedor <fedor@boulder.colorado.edu>
+   Written by:  R. Andrew McCallum <mccallum@gnu.ai.mit.edu>
+   From skeleton by:  Adam Fedor <fedor@boulder.colorado.edu>
    Date: Mar 1995
    
    This file is part of the GNU Objective C Class Library.
@@ -22,46 +23,84 @@
    */
 
 #include <Foundation/NSDictionary.h>
+#include <Foundation/NSGDictionary.h>
+#include <Foundation/NSArray.h>
+#include <Foundation/NSUtilities.h>
+#include <objects/NSString.h>
+#include <assert.h>
 
 @implementation NSDictionary 
 
-- copyWithZone:(NSZone *)zone
++ allocWithZone: (NSZone*)z
 {
-  return [super copyWithZone:zone];
+  return NSAllocateObject([NSGDictionary class], 0, z);
-}
-
-+ allocWithZone:(NSZone *)zone
-{
-  return [super allocWithZone:zone];
 }
 
 + dictionary
 {
-  return [[[NSDictionary alloc] init] autorelease];
+  return [[[NSGDictionary alloc] init] 
+	  autorelease];
 }
 
-+ dictionaryWithObjects:(id *)objects forKeys:(NSString **)keys count:(unsigned)count
++ dictionaryWithObjects: (id*)objects 
+		forKeys: (NSString**)keys
+		  count: (unsigned)count
 {
-  [self notImplemented:_cmd];
+  return [[[NSGDictionary alloc] initWithObjects:objects
-  return 0;
+				 forKeys:keys
+				 count:count]
+	  autorelease];
+}
+
+- initWithObjects: (NSArray*)objects forKeys: (NSArray*)keys
+{
+  int c = [objects count];
+  id os[c], ks[c];
+  int i;
+  
+  assert(c == [keys count]); /* Should be NSException instead */
+  for (i = 0; i < c; i++)
+    {
+      os[i] = [objects objectAtIndex:i];
+      ks[i] = [keys objectAtIndex:i];
+    }
+  return [self initWithObjects:os forKeys:ks count:c];
 }
 
 + dictionaryWithObjects: (NSArray*)objects forKeys: (NSArray*)keys
 {
-  [self notImplemented:_cmd];
+  return [[[NSGDictionary alloc] initWithObjects:objects forKeys:keys]
-  return 0;
+	  autorelease];
 }
 
-- initWithObjects:(id *)objects forKeys:(NSString **)keys count:(unsigned)count
+/* This is the designated initializer */
+- initWithObjects: (id*)objects
+	  forKeys: (NSString**)keys
+	    count: (unsigned)count
 {
   [self notImplemented:_cmd];
   return 0;
 }
 
-- initWithDictionary:(NSDictionary *)otherDictionary
+/* Override superclass's designated initializer */
+- init
 {
-  [self notImplemented:_cmd];
+  return [self initWithObjects:NULL forKeys:NULL count:0];
-  return 0;
+}
+
+- initWithDictionary: (NSDictionary*)other
+{
+  int c = [other count];
+  id os[c], ks[c], k, e = [other keyEnumerator];
+  int i = 0;
+
+  while ((k = [e nextObject]))
+    {
+      ks[i] = k;
+      os[i] = [other objectForKey:k];
+      i++;
+    }
+  return [self initWithObjects:os forKeys:ks count:c];
 }
 
 - initWithContentsOfFile: (NSString*)path
@@ -82,15 +121,31 @@
   return 0;
 }
 
-//- (NSEnumerator *)keyEnumerator
+- (NSEnumerator*) keyEnumerator
-//{
+{
-  //    [self notImplemented:_cmd];
+  [self notImplemented:_cmd];
-  //}
+  return nil;
+}
+
+- (BOOL) isEqual: other
+{
+  if ([other isKindOfClass:[NSDictionary class]])
+    return [self isEqualToDictionary:other];
+  return NO;
+}
 
 - (BOOL) isEqualToDictionary: (NSDictionary*)other
 {
-  [self notImplemented:_cmd];
+  if ([self count] != [other count])
-  return 0;
+    return NO;
+  {
+    id k, e = [self keyEnumerator];
+    while ((k = [e nextObject]))
+      if (![[self objectForKey:k] isEqual:[other objectForKey:k]])
+	return NO;
+  }
+  /* xxx Recheck this. */
+  return YES;
 }
 
 - (NSString*) description
@@ -101,26 +156,54 @@
 
 - (NSString*) descriptionWithIndent: (unsigned)level
 {
-  [self notImplemented:_cmd];
+  /* xxx Fix this when we get %@ working in format strings. */
-  return 0;
+  return [NSString stringWithFormat:@"%*s%s", 
+		   level, "", [[self description] cString]];
 }
 
 - (NSArray*) allKeys
 {
-  [self notImplemented:_cmd];
+  id e = [self keyEnumerator];
-  return 0;
+  int i, c = [self count];
+  id k[c];
+
+  for (i = 0; i < c; i++)
+    {
+      k[i] = [e nextObject];
+      assert(k[i]);
+    }
+  assert(![e nextObject]);
+  return [[[NSArray alloc] initWithObjects:k count:c]
+	  autorelease];
 }
 
 - (NSArray*) allValues
 {
-  [self notImplemented:_cmd];
+  id e = [self objectEnumerator];
-  return 0;
+  int i, c = [self count];
+  id k[c];
+
+  for (i = 0; i < c; i++)
+    {
+      k[i] = [e nextObject];
+      assert(k[i]);
+    }
+  assert(![e nextObject]);
+  return [[[NSArray alloc] initWithObjects:k count:c]
+	  autorelease];
 }
 
 - (NSArray*) allKeysForObject: anObject
 {
-  [self notImplemented:_cmd];
+  id k, e = [self keyEnumerator];
-  return 0;
+  id a[[self count]];
+  int c = 0;
+
+  while ((k = [e nextObject]))
+    if ([anObject isEqual:[k objectForKey:k]])
+      a[c++] = k;
+  return [[[NSArray alloc] initWithObjects:a count:c]
+	  autorelease];
 }
 
 - (BOOL)writeToFile:(NSString *)path atomically:(BOOL)useAuxiliaryFile
@@ -129,34 +212,54 @@
   return 0;
 }
 
-//- (NSEnumerator *)objectEnumerator
+- (NSEnumerator*) objectEnumerator
-//{
+{
-  //    [self notImplemented:_cmd];
+  [self notImplemented:_cmd];
-  //}
+  return nil;
+}
 
+- copyWithZone: (NSZone*)z
+{
+  return [[NSGDictionary alloc] initWithDictionary:self];
+}
+
+- mutableCopyWithZone: (NSZone*)z
+{
+  return [[NSGMutableDictionary alloc] initWithDictionary:self];
+}
 
 @end
 
 @implementation NSMutableDictionary
 
-+ allocWithZone:(NSZone *)zone
++ allocWithZone: (NSZone*)z
 {
-  [self notImplemented:_cmd];
+  return NSAllocateObject([NSGMutableDictionary class], 0, z);
-  return 0;
 }
 
 + dictionaryWithCapacity: (unsigned)numItems
 {
-  [self notImplemented:_cmd];
+  return [[[NSGDictionary alloc] initWithCapacity:numItems]
-  return 0;
+	  autorelease];
 }
 
+/* This is the designated initializer */
 - initWithCapacity: (unsigned)numItems
 {
   [self notImplemented:_cmd];
   return 0;
 }
 
+/* Override superclass's designated initializer */
+- initWithObjects: (id*)objects
+	  forKeys: (NSString**)keys
+	    count: (unsigned)count
+{
+  [self initWithCapacity:count];
+  while (count--)
+    [self setObject:objects[count] forKey:keys[count]];
+  return self;
+}
 
 - (void) setObject:anObject forKey:(NSString *)aKey
 {
@@ -170,17 +273,23 @@
 
 - (void) removeAllObjects
 {
-  [self notImplemented:_cmd];
+  id k, e = [self keyEnumerator];
+  while ((k = [e nextObject]))
+    [self removeObjectForKey:k];
 }
 
 - (void) removeObjectsForKeys: (NSArray*)keyArray
 {
-  [self notImplemented:_cmd];
+  int c = [keyArray count];
+  while (c--)
+    [self removeObjectForKey:[keyArray objectAtIndex:c]];
 }
 
-- (void)addEntriesFromDictionary:(NSDictionary *)otherDictionary
+- (void) addEntriesFromDictionary: (NSDictionary*)other
 {
-  [self notImplemented:_cmd];
+  id k, e = [other keyEnumerator];
+  while ((k = [e nextObject]))
+    [self setObject:[other objectForKey:k] forKey:k];
 }