Initial revision

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

Headers/gnustep/base/NSGDictionary.h

@@ -0,0 +1,51 @@
+/* Interface to concrete implementation of NSDictionary based on GNU Array
+   Copyright (C) 1995 Free Software Foundation, Inc.
+   
+   Written by:  R. Andrew McCallum <mccallum@gnu.ai.mit.edu>
+   Date: April 1995
+   
+   This file is part of the GNU Objective C Class 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.
+   */
+
+#ifndef __NSGDictionary_h_OBJECTS_INCLUDE
+#define __NSGDictionary_h_OBJECTS_INCLUDE
+
+#include <objects/stdobjects.h>
+#include <Foundation/NSDictionary.h>
+#include <objects/elt.h>
+
+@interface NSGDictionary : NSDictionary
+{
+  /* For now, these must match the instance variables in objects/Dictionary.h.
+     This will change. */
+  coll_cache_ptr _contents_hash;	// a hashtable to hold the contents;
+  int (*_comparison_function)(elt,elt);
+}
+
+@end
+
+@interface NSGMutableDictionary : NSMutableDictionary
+{
+  /* For now, these must match the instance variables in objects/Array.h.
+     This will change. */
+  coll_cache_ptr _contents_hash;	// a hashtable to hold the contents;
+  int (*_comparison_function)(elt,elt);
+}
+
+@end
+
+#endif /* __NSGDictionary_h_OBJECTS_INCLUDE */

Source/NSGDictionary.m

@@ -0,0 +1,176 @@
+/* Concrete implementation of NSDictionary based on GNU Dictionary class
+   Copyright (C) 1995 Free Software Foundation, Inc.
+   
+   Written by:  R. Andrew McCallum <mccallum@gnu.ai.mit.edu>
+   Date: April 1995
+   
+   This file is part of the GNU Objective C Class 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 <Foundation/NSGDictionary.h>
+#include <objects/NSDictionary.h>
+#include <objects/behavior.h>
+#include <objects/Dictionary.h>
+#include <objects/eltfuncs.h>
+#include <Foundation/NSUtilities.h>
+#include <Foundation/NSString.h>
+
+@interface NSGDictionaryKeyEnumerator : NSEnumerator
+{
+  NSDictionary *dictionary;
+  void *enum_state;
+}
+@end
+
+@implementation NSGDictionaryKeyEnumerator
+
+- initWithDictionary: (NSDictionary*)d
+{
+  [super init];
+  [dictionary retain];
+  dictionary = d;
+  enum_state = 0;
+  return self;
+}
+
+- nextObject
+{
+  elt k, c;
+  if ([dictionary getNextKey:&k content:&c withEnumState:&enum_state])
+    return k.id_u;
+  else
+    return nil;
+}
+
+- (void) dealloc
+{
+  [dictionary release];
+  [super dealloc];
+}
+
+@end
+
+@interface NSGDictionaryObjectEnumerator : NSGDictionaryKeyEnumerator
+@end
+
+@implementation NSGDictionaryObjectEnumerator
+
+- nextObject
+{
+  elt k, c;
+  if ([dictionary getNextKey:&k content:&c withEnumState:&enum_state])
+    return c.id_u;
+  else
+    return nil;
+}
+
+@end
+
+
+@implementation NSGDictionary
+
++ (void) initialize
+{
+  static int done = 0;
+  if (!done)
+    {
+      done = 1;
+      class_add_behavior([NSGDictionary class], [Dictionary class]);
+    }
+}
+
+/* This is the designated initializer */
+- initWithObjects: (id*)objects
+	  forKeys: (NSString**)keys
+	    count: (unsigned)count
+{
+  char * content_encoding = @encode(id);
+  char * key_encoding = @encode(id);
+  CALL_METHOD_IN_CLASS([KeyedCollection class], initWithType:keyType:,
+		       content_encoding, key_encoding);
+  _contents_hash = 
+    coll_hash_new(POWER_OF_TWO(count),
+		  elt_get_hash_function(key_encoding),
+		  elt_get_comparison_function(key_encoding));
+  _comparison_function = elt_get_comparison_function(content_encoding);
+  while (count--)
+    {
+      [keys[count] retain];
+      [objects[count] retain];
+      coll_hash_add(&_contents_hash, keys[count], objects[count]);
+    }
+  return self;
+}
+
+/* 
+   Comes from Dictionary.m 
+   - (unsigned) count 
+   */
+
+- objectForKey: (NSString*)aKey
+{
+  elt ret_nil(arglist_t a)
+    {
+      return nil;
+    }
+  return [self elementAtKey:aKey ifAbsentCall:ret_nil].id_u;
+}
+
+- (NSEnumerator*) keyEnumerator
+{
+  return [[NSGDictionaryKeyEnumerator alloc] initWithDictionary:self];
+}
+
+- (NSEnumerator*) objectEnumerator
+{
+  return [[NSGDictionaryObjectEnumerator alloc] initWithDictionary:self];
+}
+
+@end
+
+@implementation NSGMutableDictionary
+
++ (void) initialize
+{
+  static int done = 0;
+  if (!done)
+    {
+      done = 1;
+      class_add_behavior([NSGMutableDictionary class], [NSGDictionary class]);
+    }
+}
+
+/* This is the designated initializer */
+/* Comes from Dictionary.m
+   - initWithCapacity: (unsigned)numItems
+   */
+
+- (void) setObject:anObject forKey:(NSString *)aKey
+{
+  [self putElement:anObject atKey:aKey];
+}
+
+- (void) removeObjectForKey:(NSString *)aKey
+{
+  elt do_nothing (arglist_t a)
+    {
+      return 0;
+    }
+  [self removeElementAtKey:aKey ifAbsentCall:do_nothing];
+}
+
+@end

Source/objects/NSDictionary.h

@@ -0,0 +1,45 @@
+/* GNU extensions to NSDictionary.
+   Copyright (C) 1995 Free Software Foundation, Inc.
+
+   Written by:  R. Andrew McCallum <mccallum@gnu.ai.mit.edu>
+   Date: April 1995
+
+   This file is part of the GNU Objective C Class 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.
+*/
+
+/* You can include this instead of (or in addition to)
+   Foundation/NSDictionary.h if you want to use the GNU extensions. */
+
+#ifndef __objects_NSDictionary_h_OBJECTS_INCLUDE
+#define __objects_NSDictionary_h_OBJECTS_INCLUDE
+
+#include <objects/stdobjects.h>
+#include <objects/KeyedCollecting.h>
+#include <Foundation/NSDictionary.h>
+
+/* Eventually we'll make a Constant version of this protocol. */
+@interface NSDictionary (GNU) <KeyedCollecting>
+@end
+
+@interface NSMutableDictionary (GNU)
++ (unsigned) defaultCapacity;
+- initWithType: (const char *)contentEncoding
+    keyType: (const char *)keyEncoding
+    capacity: (unsigned)aCapacity;
+@end
+
+#endif /* __objects_NSDictionary_h_OBJECTS_INCLUDE */

Testing/nsdictionary.m

@@ -0,0 +1,45 @@
+#include <Foundation/NSDictionary.h>
+#include <Foundation/NSString.h>
+#include <Foundation/NSArray.h>
+
+int
+main()
+{
+  id a, b;			/* dictionaries */
+  id enumerator;
+  id objects, keys;
+  id key;
+
+  set_behavior_debug(0);
+
+  objects = [NSArray arrayWithObjects:
+		     @"vache", @"poisson", @"cheval", @"poulet", nil];
+  keys = [NSArray arrayWithObjects:
+		  @"cow", @"fish", @"horse", @"chicken", nil];
+  a = [NSDictionary dictionaryWithObjects:objects forKeys:keys];
+
+  printf("NSDictionary has count %d\n", [a count]);
+  key = @"fish";
+  printf("Object at key %s is %s\n", 
+	 [key cString],
+	 [[a objectForKey:key] cString]);
+
+  assert([a count] == [[a allValues] count]);
+  
+  enumerator = [a objectEnumerator];
+  while ((b = [enumerator nextObject]))
+    printf("%s ", [b cString]);
+  printf("\n");
+
+  enumerator = [a keyEnumerator];
+  while ((b = [enumerator nextObject]))
+    printf("%s ", [b cString]);
+  printf("\n");
+
+  b = [a mutableCopy];
+  assert([b count]);
+  [b setObject:@"formi" forKey:@"ant"];
+  [b removeObjectForKey:@"horse"];
+
+  exit(0);
+}