Added Sets as distinct types within template. This will make
merging sets and mapping objects (e.g. integer sets and
integer to integer mappings) easier later.

Split template into multiple files.

Change buckets to use separate key and value arrays.
This makes set handling (null value arrays) a little simpler
and will allow us to save memory if we implement types with
small keys or values (e.g. short keys).

src/BTrees/IBTree.c

-/* Setup template macros */
-
-#define PREFIX "I"
-#define INITMODULE initIBTree
-#define DEFAULT_MAX_BUCKET_SIZE 100
-
-#include "intkeymacros.h"
-#include "novaluemacros.h"
-#include "BTreeTemplate.c"

src/BTrees/OBTree.c

-#define PREFIX "O"
-#define INITMODULE initOBTree
-#define DEFAULT_MAX_BUCKET_SIZE 100
-                                
-#include "objectkeymacros.h"
-#include "novaluemacros.h"
-#include "BTreeTemplate.c"

src/BTrees/SetTemplate.c

+/*****************************************************************************
+  
+  Zope Public License (ZPL) Version 1.0
+  -------------------------------------
+  
+  Copyright (c) Digital Creations.  All rights reserved.
+  
+  This license has been certified as Open Source(tm).
+  
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+  
+  1. Redistributions in source code must retain the above copyright
+     notice, this list of conditions, and the following disclaimer.
+  
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions, and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+  
+  3. Digital Creations requests that attribution be given to Zope
+     in any manner possible. Zope includes a "Powered by Zope"
+     button that is installed by default. While it is not a license
+     violation to remove this button, it is requested that the
+     attribution remain. A significant investment has been put
+     into Zope, and this effort will continue if the Zope community
+     continues to grow. This is one way to assure that growth.
+  
+  4. All advertising materials and documentation mentioning
+     features derived from or use of this software must display
+     the following acknowledgement:
+  
+       "This product includes software developed by Digital Creations
+       for use in the Z Object Publishing Environment
+       (http://www.zope.org/)."
+  
+     In the event that the product being advertised includes an
+     intact Zope distribution (with copyright and license included)
+     then this clause is waived.
+  
+  5. Names associated with Zope or Digital Creations must not be used to
+     endorse or promote products derived from this software without
+     prior written permission from Digital Creations.
+  
+  6. Modified redistributions of any form whatsoever must retain
+     the following acknowledgment:
+  
+       "This product includes software developed by Digital Creations
+       for use in the Z Object Publishing Environment
+       (http://www.zope.org/)."
+  
+     Intact (re-)distributions of any official Zope release do not
+     require an external acknowledgement.
+  
+  7. Modifications are encouraged but must be packaged separately as
+     patches to official Zope releases.  Distributions that do not
+     clearly separate the patches from the original work must be clearly
+     labeled as unofficial distributions.  Modifications which do not
+     carry the name Zope may be packaged in any form, as long as they
+     conform to all of the clauses above.
+  
+  
+  Disclaimer
+  
+    THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+    EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+    USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+    OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+  
+  
+  This software consists of contributions made by Digital Creations and
+  many individuals on behalf of Digital Creations.  Specific
+  attributions are listed in the accompanying credits file.
+  
+ ****************************************************************************/
+
+static PyObject *
+Set_insert(Bucket *self, PyObject *args)
+{
+  PyObject *key;
+  int i;
+
+  UNLESS (PyArg_ParseTuple(args, "O", &key)) return NULL;
+  if ( (i=_bucket_set(self, key, Py_None, 1, 1)) < 0) return NULL;
+  return PyInt_FromLong(i);
+}
+
+static PyObject *
+Set_remove(Bucket *self, PyObject *args)
+{
+  PyObject *key;
+
+  UNLESS (PyArg_ParseTuple(args, "O", &key)) return NULL;
+  if (_bucket_set(self, key, NULL, 0, 1) < 0) return NULL;
+
+  Py_INCREF(Py_None);
+  return Py_None;
+}
+
+static PyObject *
+set_getstate(Bucket *self, PyObject *args)
+{
+  PyObject *r=0, *o=0, *items=0;
+  int i, l;
+
+  PER_USE_OR_RETURN(self, NULL);
+
+  l=self->len;
+
+  UNLESS (items=PyTuple_New(self->len)) goto err;
+  for (i=0; i<l; i++)
+    {
+      COPY_KEY_TO_OBJECT(o, self->keys[i]);
+      UNLESS (o) goto err;
+      PyTuple_SET_ITEM(items, i, o);
+    }
+
+  if (self->next) 
+    r=Py_BuildValue("OO", items, self->next);
+  else
+    r=Py_BuildValue("(O)", items);
+
+  PER_ALLOW_DEACTIVATION(self);
+
+  return r;
+
+err:
+  PER_ALLOW_DEACTIVATION(self);
+  Py_XDECREF(items);
+  Py_XDECREF(r);
+  return NULL;
+}
+
+static PyObject *
+set_setstate(Bucket *self, PyObject *args)
+{
+  PyObject *k, *items;
+  Bucket *next=0;
+  int i, l, copied=1;
+  KEY_TYPE *keys;
+  VALUE_TYPE *values;
+
+  PER_PREVENT_DEACTIVATION(self); 
+
+  UNLESS (PyArg_ParseTuple(args, "O", &args)) goto err;
+
+  UNLESS (PyArg_ParseTuple(args, "O|O!", &items, self->ob_type, &next))
+    goto err;
+
+  if ((l=PyTuple_Size(items)) < 0) goto err;
+
+  for (i=self->len; --i >= 0; )
+    {
+      DECREF_KEY(self->keys[i]);
+    }
+  self->len=0;
+
+  if (self->next)
+    {
+      Py_DECREF(self->next);
+      self->next=0;
+    }
+  
+  if (l > self->size)
+    {
+      UNLESS (keys=PyRealloc(self->keys, sizeof(KEY_TYPE)*l)) goto err;
+      self->keys=keys;
+      self->size=l;
+    }
+  
+  for (i=0; i<l; i++)
+    {
+      k=PyTuple_GET_ITEM(items, i);
+      COPY_KEY_FROM_ARG(self->keys[i], k, &copied);
+      UNLESS (copied) return NULL;
+      INCREF_KEY(k);
+    }
+
+  self->len=l;
+
+  PER_ALLOW_DEACTIVATION(self);
+  Py_INCREF(Py_None);
+  return Py_None;
+
+ perr:
+  self->len=i;
+ err:
+  PER_ALLOW_DEACTIVATION(self);
+  return NULL;
+}
+
+static struct PyMethodDef Set_methods[] = {
+  {"__getstate__", (PyCFunction) set_getstate,	METH_VARARGS,
+   "__getstate__() -- Return the picklable state of the object"},
+  {"__setstate__", (PyCFunction) set_setstate,	METH_VARARGS,
+   "__setstate__() -- Set the state of the object"},
+  {"keys",	(PyCFunction) bucket_keys,	METH_VARARGS,
+     "keys() -- Return the keys"},
+  {"items",	(PyCFunction) bucket_keys,	METH_VARARGS,
+     "items() -- Return the items"},
+  {"has_key",	(PyCFunction) bucket_has_key,	METH_VARARGS,
+     "has_key(key) -- Test whether the bucket contains the given key"},
+  {"clear",	(PyCFunction) bucket_clear,	METH_VARARGS,
+   "clear() -- Remove all of the items from the bucket"},
+  {"maxKey", (PyCFunction) Bucket_maxKey,	METH_VARARGS,
+   "maxKey([key]) -- Fine the maximum key\n\n"
+   "If an argument is given, find the maximum <= the argument"},
+  {"minKey", (PyCFunction) Bucket_minKey,	METH_VARARGS,
+   "minKey([key]) -- Fine the minimum key\n\n"
+   "If an argument is given, find the minimum >= the argument"},
+  {"_p_deactivate", (PyCFunction) bucket__p_deactivate, METH_VARARGS,
+   "_p_deactivate() -- Reinitialize from a newly created copy"},
+
+  {"insert",	(PyCFunction)Set_insert,	METH_VARARGS,
+   "insert(id,[ignored]) -- Add a key to the set"},
+  {"remove",	(PyCFunction)Set_remove,	METH_VARARGS,
+   "remove(id) -- Remove an id from the set"},
+
+  {NULL,		NULL}		/* sentinel */
+};
+
+static PyObject *
+set_repr(Bucket *self)
+{
+  static PyObject *format;
+  PyObject *r, *t;
+
+  UNLESS (format) UNLESS (format=PyString_FromString(PREFIX "Bucket(%s)")) 
+    return NULL;
+  UNLESS (t=PyTuple_New(1)) return NULL;
+  UNLESS (r=bucket_keys(self,NULL)) goto err;
+  PyTuple_SET_ITEM(t,0,r);
+  r=t;
+  ASSIGN(r,PyString_Format(format,r));
+  return r;
+err:
+  Py_DECREF(t);
+  return NULL;
+}
+
+static PyExtensionClass SetType = {
+  PyObject_HEAD_INIT(NULL)
+  0,				/*ob_size*/
+  PREFIX "Set",			/*tp_name*/
+  sizeof(Bucket),		/*tp_basicsize*/
+  0,				/*tp_itemsize*/
+  /*********** methods ***********************/
+  (destructor) Bucket_dealloc,	/*tp_dealloc*/
+  (printfunc)0,			/*tp_print*/
+  (getattrfunc)0,		/*obsolete tp_getattr*/
+  (setattrfunc)0,		/*obsolete tp_setattr*/
+  (cmpfunc)0,			/*tp_compare*/
+  (reprfunc) set_repr,	/*tp_repr*/
+  0,				/*tp_as_number*/
+  0,				/*tp_as_sequence*/
+  0,		                /*tp_as_mapping*/
+  (hashfunc)0,			/*tp_hash*/
+  (ternaryfunc)0,		/*tp_call*/
+  (reprfunc)0,			/*tp_str*/
+  (getattrofunc)0,		/*tp_getattro*/
+  0,				/*tp_setattro*/
+  
+  /* Space for future expansion */
+  0L,0L,
+  "Set implemented as sorted keys", 
+  METHOD_CHAIN(Set_methods),
+  EXTENSIONCLASS_BASICNEW_FLAG | PERSISTENT_TYPE_FLAG,
+};

src/BTrees/Setup

 *shared*
 OOBTree OOBTree.c  -I../../Components/ExtensionClass -I../ZODB
 OIBTree OIBTree.c  -I../../Components/ExtensionClass -I../ZODB
-OBTree OBTree.c   -I../../Components/ExtensionClass -I../ZODB
 IIBTree IIBTree.c  -I../../Components/ExtensionClass -I../ZODB
 IOBTree IOBTree.c  -I../../Components/ExtensionClass -I../ZODB
-IBTree IBTree.c   -I../../Components/ExtensionClass -I../ZODB

src/BTrees/TreeSetTemplate.c

+/*****************************************************************************
+  
+  Zope Public License (ZPL) Version 1.0
+  -------------------------------------
+  
+  Copyright (c) Digital Creations.  All rights reserved.
+  
+  This license has been certified as Open Source(tm).
+  
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+  
+  1. Redistributions in source code must retain the above copyright
+     notice, this list of conditions, and the following disclaimer.
+  
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions, and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+  
+  3. Digital Creations requests that attribution be given to Zope
+     in any manner possible. Zope includes a "Powered by Zope"
+     button that is installed by default. While it is not a license
+     violation to remove this button, it is requested that the
+     attribution remain. A significant investment has been put
+     into Zope, and this effort will continue if the Zope community
+     continues to grow. This is one way to assure that growth.
+  
+  4. All advertising materials and documentation mentioning
+     features derived from or use of this software must display
+     the following acknowledgement:
+  
+       "This product includes software developed by Digital Creations
+       for use in the Z Object Publishing Environment
+       (http://www.zope.org/)."
+  
+     In the event that the product being advertised includes an
+     intact Zope distribution (with copyright and license included)
+     then this clause is waived.
+  
+  5. Names associated with Zope or Digital Creations must not be used to
+     endorse or promote products derived from this software without
+     prior written permission from Digital Creations.
+  
+  6. Modified redistributions of any form whatsoever must retain
+     the following acknowledgment:
+  
+       "This product includes software developed by Digital Creations
+       for use in the Z Object Publishing Environment
+       (http://www.zope.org/)."
+  
+     Intact (re-)distributions of any official Zope release do not
+     require an external acknowledgement.
+  
+  7. Modifications are encouraged but must be packaged separately as
+     patches to official Zope releases.  Distributions that do not
+     clearly separate the patches from the original work must be clearly
+     labeled as unofficial distributions.  Modifications which do not
+     carry the name Zope may be packaged in any form, as long as they
+     conform to all of the clauses above.
+  
+  
+  Disclaimer
+  
+    THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+    EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+    USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+    OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+  
+  
+  This software consists of contributions made by Digital Creations and
+  many individuals on behalf of Digital Creations.  Specific
+  attributions are listed in the accompanying credits file.
+  
+ ****************************************************************************/
+
+static PyObject *
+TreeSet_insert(BTree *self, PyObject *args)
+{
+  PyObject *key;
+  int i;
+
+  UNLESS (PyArg_ParseTuple(args, "O", &key)) return NULL;
+  if ((i=_BTree_set(self, key, Py_None, 1, 1)) < 0) return NULL;
+  return PyInt_FromLong(i);
+}
+
+static PyObject *
+TreeSet_remove(BTree *self, PyObject *args)
+{
+  PyObject *key;
+
+  UNLESS (PyArg_ParseTuple(args, "O", &key)) return NULL;
+  if (_BTree_set(self, key, NULL, 0, 1) < 0) return NULL;
+  Py_INCREF(Py_None);
+  return Py_None;
+}
+
+static struct PyMethodDef TreeSet_methods[] = {
+  {"__getstate__", (PyCFunction) BTree_getstate,	METH_VARARGS,
+   "__getstate__() -- Return the picklable state of the object"},
+  {"__setstate__", (PyCFunction) BTree_setstate,	METH_VARARGS,
+   "__setstate__() -- Set the state of the object"},
+  {"has_key",	(PyCFunction) BTree_has_key,	METH_VARARGS,
+     "has_key(key) -- Test whether the bucket contains the given key"},
+  {"keys",	(PyCFunction) BTree_keys,	METH_VARARGS,
+     "keys() -- Return the keys"},
+  {"items",	(PyCFunction) BTree_items,	METH_VARARGS,
+     "items() -- Return the items"},
+  {"maxKey", (PyCFunction) BTree_maxKey,	METH_VARARGS,
+   "maxKey([key]) -- Fine the maximum key\n\n"
+   "If an argument is given, find the maximum <= the argument"},
+  {"minKey", (PyCFunction) BTree_minKey,	METH_VARARGS,
+   "minKey([key]) -- Fine the minimum key\n\n"
+   "If an argument is given, find the minimum >= the argument"},
+  {"clear",	(PyCFunction) BTree_clear,	METH_VARARGS,
+   "clear() -- Remove all of the items from the BTree"},  
+  {"insert",	(PyCFunction)TreeSet_insert,	METH_VARARGS,
+   "insert(id,[ignored]) -- Add an id to the set"},
+  {"remove",	(PyCFunction)TreeSet_remove,	METH_VARARGS,
+   "remove(id) -- Remove a key from the set"},
+  {"_p_deactivate", (PyCFunction) BTree__p_deactivate,	METH_VARARGS,
+   "_p_deactivate() -- Reinitialize from a newly created copy"},
+  {NULL,		NULL}		/* sentinel */
+};
+
+static PyExtensionClass TreeSetType = {
+  PyObject_HEAD_INIT(NULL)
+  0,				/*ob_size*/
+  PREFIX "TreeSet",		/*tp_name*/
+  sizeof(BTree),		/*tp_basicsize*/
+  0,				/*tp_itemsize*/
+  /************* methods ********************/
+  (destructor) BTree_dealloc,   /*tp_dealloc*/
+  (printfunc)0,			/*tp_print*/
+  (getattrfunc)0,		/*obsolete tp_getattr*/
+  (setattrfunc)0,		/*obsolete tp_setattr*/
+  (cmpfunc)0,			/*tp_compare*/
+  (reprfunc)0,			/*tp_repr*/
+  &BTree_as_number_for_nonzero,	/*tp_as_number*/
+  0,				/*tp_as_sequence*/
+  0,				/*tp_as_mapping*/
+  (hashfunc)0,			/*tp_hash*/
+  (ternaryfunc)0,		/*tp_call*/
+  (reprfunc)0,			/*tp_str*/
+  (getattrofunc)0,
+  0,				/*tp_setattro*/
+  
+  /* Space for future expansion */
+  0L,0L,
+  "Set implemented as sorted tree of items", 
+  METHOD_CHAIN(TreeSet_methods),
+  EXTENSIONCLASS_BASICNEW_FLAG | PERSISTENT_TYPE_FLAG,
+};

src/BTrees/novaluemacros.h

-#define NOVAL
-#define DECLARE_VALUE(NAME)
-#define DECREF_VALUE(k)
-#define INCREF_VALUE(k)
-#define COPY_VALUE(V, E)
-#define COPY_VALUE_TO_OBJECT(O, K)
-#define COPY_VALUE_FROM_ARG(TARGET, ARG, S)