Fixed a number of bugs found by unit tests.

Added flags to prevent subclasses from having instance dictionaries.
It's not clear that people will actually subclass these things and
supporting instance dictionaries adds extra effort at this time, which
we can't afford.

src/BTrees/BTreeTemplate.c

@@ -85,7 +85,7 @@
 
 static char BTree_module_documentation[] = 
 ""
-"\n$Id: BTreeTemplate.c,v 1.4 2001/02/05 02:28:53 jim Exp $"
+"\n$Id: BTreeTemplate.c,v 1.5 2001/02/15 18:15:10 jim Exp $"
 ;
 
 #include "cPersistence.h"
@@ -110,7 +110,6 @@ static void PyVar_Assign(PyObject **v, PyObject *e) { Py_XDECREF(*v); *v=e;}
 #define ASSIGNC(V,E) (Py_INCREF((E)), PyVar_Assign(&(V),(E)))
 #define UNLESS(E) if (!(E))
 #define UNLESS_ASSIGN(V,E) ASSIGN(V,E); UNLESS(V)
-#define RETURN_NONE Py_INCREF(Py_None); return Py_None
 #define LIST(O) ((PyListObject*)(O))
 #define OBJECT(O) ((PyObject*)(O))
 
@@ -749,10 +748,7 @@ BTree__p_deactivate(BTree *self, PyObject *args)
 {
   if (self->state==cPersistent_UPTODATE_STATE)
     {
-      PyObject *dict;
-
       if (_BTree_clear(self) < 0) return NULL;
-      if (HasInstDict(self) && (dict=INSTANCE_DICT(self))) PyDict_Clear(dict);
       self->state=cPersistent_GHOST_STATE;
     }
 
@@ -775,13 +771,17 @@ static PyObject *
 BTree_clear(BTree *self, PyObject *args)
 {
   PER_USE_OR_RETURN(self, NULL);
-  if (_BTree_clear(self) < 0) goto err;
 
-  if (PER_CHANGED(self) < 0) goto err;
+  if (self->len)
+    {
+      if (_BTree_clear(self) < 0) goto err;
+      if (PER_CHANGED(self) < 0) goto err;
+    }
 
   PER_ALLOW_DEACTIVATION(self);
 
-  RETURN_NONE;
+  Py_INCREF(Py_None); 
+  return Py_None;
 
 err:
   PER_ALLOW_DEACTIVATION(self);
@@ -797,36 +797,43 @@ err:
 static PyObject *
 BTree_getstate(BTree *self, PyObject *args)
 {
-  PyObject *r=0, *o, *item;
-  PyObject *result;
+  PyObject *r=0, *o, *item, *result;
   int i;
 
   PER_USE_OR_RETURN(self, NULL);
 
-  UNLESS (r=PyTuple_New(self->len)) goto err;
-  for (i=self->len; --i >= 0; )
+  if (self->len)
     {
-      UNLESS (item=PyTuple_New(2)) goto err;
-      if (i)
-        {
-          COPY_KEY_TO_OBJECT(o, self->data[i].key);
-        }
-      else
+      UNLESS (r=PyTuple_New(self->len)) goto err;
+      for (i=self->len; --i >= 0; )
         {
-          o=Py_None;
+          UNLESS (item=PyTuple_New(2)) goto err;
+          if (i)
+            {
+              COPY_KEY_TO_OBJECT(o, self->data[i].key);
+            }
+          else
+            {
+              o=Py_None;
+              Py_INCREF(o);
+            }
+          PyTuple_SET_ITEM(item, 0, o);
+          o=self->data[i].value;
           Py_INCREF(o);
+          PyTuple_SET_ITEM(item, 1, o);
+          PyTuple_SET_ITEM(r,i,item);
         }
-      PyTuple_SET_ITEM(item, 0, o);
-      o=self->data[i].value;
-      Py_INCREF(o);
-      PyTuple_SET_ITEM(item, 1, o);
-      PyTuple_SET_ITEM(r,i,item);
+      result = Py_BuildValue("OO", r, self->firstbucket);
+      Py_DECREF(r);
     }
-
-  result = Py_BuildValue("OO", r, self->firstbucket);
+  else
+    {
+      result = Py_None;
+      Py_INCREF(result);
+    }  
+      
 
   PER_ALLOW_DEACTIVATION(self);
-  Py_DECREF(r);
 
   return result;
 
@@ -851,43 +858,44 @@ BTree_setstate(BTree *self, PyObject *args)
 
   if (!PyArg_ParseTuple(args,"O",&state)) return NULL;
 
-  if (!PyArg_ParseTuple(state,"O|O",&items, &firstbucket))
-    return NULL;
-
-  if ((l=PyTuple_Size(items)) < 0) return NULL;
  
   PER_PREVENT_DEACTIVATION(self); 
-  ASSIGNB(self->firstbucket, firstbucket);
 
-  for (i=self->len, d=self->data; --i >= 0; d++)
-    {
-      if (d != self->data)
-        DECREF_KEY(d->key);
-      Py_DECREF(d->value);
-    }
-  self->len=0;
+  if (_BTree_clear(self) < 0) goto err;
 
-  if (l > self->size)
+  if (state != Py_None)
     {
-      UNLESS (d=PyRealloc(self->data, sizeof(BTreeItem)*l)) goto err;
-      self->data=d;
-      self->size=l;
-    }
 
-  for (i=0, d=self->data; i < l; i++, d++)
-    {
-      UNLESS (PyArg_ParseTuple(PyTuple_GET_ITEM(state,i), "OO", 
-                               &k, &(d->value)))
-	goto err;
-      if (i) 
+      if (!PyArg_ParseTuple(state,"O|O",&items, &firstbucket))
+        goto err;
+
+      if ((l=PyTuple_Size(items)) < 0) goto err;
+
+      self->firstbucket = firstbucket;
+      Py_INCREF(firstbucket);
+
+      if (l > self->size)
         {
-          COPY_KEY_FROM_ARG(d->key, k, &copied);
-          UNLESS (&copied) return NULL;
-          INCREF_KEY(d->key);
+          UNLESS (d=PyRealloc(self->data, sizeof(BTreeItem)*l)) goto err;
+          self->data=d;
+          self->size=l;
         }
-      Py_INCREF(d->value);
+
+      for (i=0, d=self->data; i < l; i++, d++)
+        {
+          UNLESS (PyArg_ParseTuple(PyTuple_GET_ITEM(state,i), "OO", 
+                                   &k, &(d->value)))
+            goto err;
+          if (i) 
+            {
+              COPY_KEY_FROM_ARG(d->key, k, &copied);
+              UNLESS (&copied) return NULL;
+              INCREF_KEY(d->key);
+            }
+          Py_INCREF(d->value);
+        }
+      self->len=l;
     }
-  self->len=l;
 
   PER_ALLOW_DEACTIVATION(self);
 
@@ -1164,8 +1172,7 @@ BTree_has_key(BTree *self, PyObject *args)
 {
   PyObject *key;
 
-  UNLESS (PyArg_ParseTuple(args,"O",&key)) return NULL;
-  return _BTree_get(self, key, 1);
+  UNLESS (PyArg_ParseTuple(args,"O",&key)) return NULL;  return _BTree_get(self, key, 1);
 }
 
 static PyObject *
@@ -1314,7 +1321,8 @@ static PyExtensionClass BTreeType = {
   0L,0L,
   "Mapping type implemented as sorted list of items", 
   METHOD_CHAIN(BTree_methods),
-  EXTENSIONCLASS_BASICNEW_FLAG | PERSISTENT_TYPE_FLAG,
+  EXTENSIONCLASS_BASICNEW_FLAG | PERSISTENT_TYPE_FLAG 
+  | EXTENSIONCLASS_NOINSTDICT_FLAG,
 };
 
 #include "TreeSetTemplate.c"
@@ -1362,7 +1370,7 @@ INITMODULE ()
   d = PyModule_GetDict(m);
 
   PyDict_SetItemString(d, "__version__",
-		       PyString_FromString("$Revision: 1.4 $"));
+		       PyString_FromString("$Revision: 1.5 $"));
 
   PyExtensionClass_Export(d,PREFIX "Bucket", BucketType);
   PyExtensionClass_Export(d,PREFIX "BTree", BTreeType);

src/BTrees/BucketTemplate.c

@@ -154,18 +154,11 @@ _bucket_set(Bucket *self, PyObject *keyarg, PyObject *v, int unique, int noval)
   int min, max, i, l, cmp, copied=1;
   KEY_TYPE key;
   KEY_TYPE *keys;
-  VALUE_TYPE value;
   VALUE_TYPE *values;
   
   COPY_KEY_FROM_ARG(key, keyarg, &copied);
   UNLESS(copied) return -1;
 
-  UNLESS (noval)
-    {
-      COPY_VALUE_FROM_ARG(value, v, &copied);
-      UNLESS(copied) return -1;
-    }
-
   PER_USE_OR_RETURN(self, -1);
 
   for (min=0, max=l=self->len, i=max/2; i != l; l=i, i=(min+max)/2)
@@ -178,7 +171,10 @@ _bucket_set(Bucket *self, PyObject *keyarg, PyObject *v, int unique, int noval)
               if (! unique && ! noval && self->values)
                 {
                   DECREF_VALUE(self->values[i]);
-                  COPY_VALUE(self->values[i], value);
+
+                  COPY_VALUE_FROM_ARG(self->values[i], v, &copied);
+                  UNLESS(copied) return -1;
+
                   INCREF_VALUE(self->values[i]);
                   if (PER_CHANGED(self) < 0) goto err;
                 }
@@ -274,7 +270,8 @@ _bucket_set(Bucket *self, PyObject *keyarg, PyObject *v, int unique, int noval)
 
   UNLESS (noval)
     {
-      COPY_VALUE(self->values[i], value);
+      COPY_VALUE_FROM_ARG(self->values[i], v, &copied);
+      UNLESS(copied) return -1;
       INCREF_VALUE(self->values[i]);
     }
 
@@ -676,15 +673,13 @@ bucket__p_deactivate(Bucket *self, PyObject *args)
   if (self->state==cPersistent_UPTODATE_STATE)
     {
       int i;
-      PyObject *dict;
 
       for (i=self->len; --i >= 0; )
 	{
 	  DECREF_KEY(self->keys[i]);
 	  if (self->values) DECREF_VALUE(self->values[i]);
 	}
-      Py_DECREF(self->next);
-      if (HasInstDict(self) && (dict=INSTANCE_DICT(self))) PyDict_Clear(dict);
+      Py_XDECREF(self->next);
       self->len=0;
       self->state=cPersistent_GHOST_STATE;
     }
@@ -720,7 +715,8 @@ bucket_clear(Bucket *self, PyObject *args)
   self->len=0;
   if (PER_CHANGED(self) < 0) goto err;
   PER_ALLOW_DEACTIVATION(self);
-  RETURN_NONE;
+  Py_INCREF(Py_None); 
+  return Py_None;
 
 err:
   PER_ALLOW_DEACTIVATION(self);
@@ -995,5 +991,6 @@ static PyExtensionClass BucketType = {
   0L,0L,
   "Mapping type implemented as sorted list of items", 
   METHOD_CHAIN(Bucket_methods),
-  EXTENSIONCLASS_BASICNEW_FLAG | PERSISTENT_TYPE_FLAG,
+  EXTENSIONCLASS_BASICNEW_FLAG | PERSISTENT_TYPE_FLAG 
+  | EXTENSIONCLASS_NOINSTDICT_FLAG,
 };

src/BTrees/SetTemplate.c

@@ -247,6 +247,46 @@ err:
   return NULL;
 }
 
+static int
+set_length(Bucket *self) 
+{
+  int r;
+
+  PER_USE_OR_RETURN(self, -1);
+  r = self->len;
+  PER_ALLOW_DEACTIVATION(self);
+
+  return r;
+}
+
+static PyObject *
+set_item(Bucket *self, int index)
+{
+  PyObject *r=0;
+
+  PER_USE_OR_RETURN(self, NULL);
+  if (index >= 0 && index < self->len)
+    {
+      COPY_KEY_TO_OBJECT(r, self->keys[index]);
+    }
+  else
+    IndexError(index);
+
+  PER_ALLOW_DEACTIVATION(self);
+
+  return r;
+}
+
+static PySequenceMethods set_as_sequence = {
+	(inquiry)set_length,		/*sq_length*/
+	(binaryfunc)0,		/*sq_concat*/
+	(intargfunc)0,		/*sq_repeat*/
+	(intargfunc)set_item,		/*sq_item*/
+	(intintargfunc)0,		/*sq_slice*/
+	(intobjargproc)0,	/*sq_ass_item*/
+	(intintobjargproc)0,	/*sq_ass_slice*/
+};
+
 static PyExtensionClass SetType = {
   PyObject_HEAD_INIT(NULL)
   0,				/*ob_size*/
@@ -259,9 +299,9 @@ static PyExtensionClass SetType = {
   (getattrfunc)0,		/*obsolete tp_getattr*/
   (setattrfunc)0,		/*obsolete tp_setattr*/
   (cmpfunc)0,			/*tp_compare*/
-  (reprfunc) set_repr,	/*tp_repr*/
+  (reprfunc) set_repr,		/*tp_repr*/
   0,				/*tp_as_number*/
-  0,				/*tp_as_sequence*/
+  &set_as_sequence,		/*tp_as_sequence*/
   0,		                /*tp_as_mapping*/
   (hashfunc)0,			/*tp_hash*/
   (ternaryfunc)0,		/*tp_call*/
@@ -273,5 +313,6 @@ static PyExtensionClass SetType = {
   0L,0L,
   "Set implemented as sorted keys", 
   METHOD_CHAIN(Set_methods),
-  EXTENSIONCLASS_BASICNEW_FLAG | PERSISTENT_TYPE_FLAG,
+  EXTENSIONCLASS_BASICNEW_FLAG | PERSISTENT_TYPE_FLAG 
+  | EXTENSIONCLASS_NOINSTDICT_FLAG,
 };

src/BTrees/TreeSetTemplate.c

@@ -159,5 +159,6 @@ static PyExtensionClass TreeSetType = {
   0L,0L,
   "Set implemented as sorted tree of items", 
   METHOD_CHAIN(TreeSet_methods),
-  EXTENSIONCLASS_BASICNEW_FLAG | PERSISTENT_TYPE_FLAG,
+  EXTENSIONCLASS_BASICNEW_FLAG | PERSISTENT_TYPE_FLAG 
+  | EXTENSIONCLASS_NOINSTDICT_FLAG,
 };