Moved macros for handling specific key or value types to separate

include files. This cleaned up the code quite a bit and should make it
pretty easy to add additional types in the future.

trunk/src/BTrees/IBTree.c

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

trunk/src/BTrees/IIBTree.c

-#define INTVAL int
-#define INTKEY int
+/* Setup template macros */
+
+#define PREFIX "II"
+#define INITMODULE initIIBTree
+#define DEFAULT_MAX_BUCKET_SIZE 100
+                
+#include "intkeymacros.h"
+#include "intvaluemacros.h"
 #include "BTreeTemplate.c"

trunk/src/BTrees/IOBTree.c

-#define INTKEY int
+#define PREFIX "IO"
+#define DEFAULT_MAX_BUCKET_SIZE 32
+#define INITMODULE initIOBTree
+                                
+#include "intkeymacros.h"
+#include "objectvaluemacros.h"
 #include "BTreeTemplate.c"

trunk/src/BTrees/OBTree.c

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

trunk/src/BTrees/OIBTree.c

-#define INTVAL int
+#define PREFIX "OI"
+#define INITMODULE initOIBTree
+#define DEFAULT_MAX_BUCKET_SIZE 64
+                                
+#include "objectkeymacros.h"
+#include "intvaluemacros.h"
 #include "BTreeTemplate.c"

trunk/src/BTrees/OOBTree.c

+#define PREFIX "OO"
+#define INITMODULE initOOBTree
+#define DEFAULT_MAX_BUCKET_SIZE 32
+                                
+#include "objectkeymacros.h"
+#include "objectvaluemacros.h"
 #include "BTreeTemplate.c"

trunk/src/BTrees/intkeymacros.h

+#define KEY_TYPE int
+#define KET_PARSE "i"
+#define TEST_KEY(KEY, TARGET) ( (KEY) - (TARGET) )
+#define DECREF_KEY(KEY)
+#define INCREF_KEY(k)
+#define COPY_KEY(KEY, E) (KEY=(E))
+#define COPY_KEY_TO_OBJECT(O, K) O=PyInt_FromLong(K)
+#define COPY_KEY_FROM_ARG(TARGET, ARG, STATUS) \
+  if (PyInt_Check(ARG)) TARGET=PyInt_AsLong(ARG); else { \
+      PyErr_SetString(PyExc_TypeError, "expected integer key"); \
+      *(STATUS)=0; } 

trunk/src/BTrees/intvaluemacros.h

+#define VALUE_TYPE int
+#define DECLARE_VALUE(NAME) VALUE_TYPE NAME
+#define VALUE_PARSE "i"
+#define DECREF_VALUE(k)
+#define INCREF_VALUE(k)
+#define COPY_VALUE(V, E) (V=(E))
+#define COPY_VALUE_TO_OBJECT(O, K) O=PyInt_FromLong(K) 
+#define COPY_VALUE_FROM_ARG(TARGET, ARG, STATUS) \
+  if (PyInt_Check(ARG)) TARGET=PyInt_AsLong(ARG); else { \
+      PyErr_SetString(PyExc_TypeError, "expected integer value"); \
+      *(STATUS)=0; } 
+  

trunk/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)

trunk/src/BTrees/objectkeymacros.h

+#define KEY_TYPE PyObject *
+#define TEST_KEY(KEY, TARGET) PyObject_Compare((KEY),(TARGET))
+#define INCREF_KEY(k) Py_INCREF(k)
+#define DECREF_KEY(KEY) Py_DECREF(KEY)
+#define COPY_KEY(KEY, E) KEY=(E)
+#define COPY_KEY_TO_OBJECT(O, K) O=(K); Py_INCREF(O)
+#define COPY_KEY_FROM_ARG(TARGET, ARG, S) TARGET=(ARG)

trunk/src/BTrees/objectvaluemacros.h

+#define VALUE_TYPE PyObject *
+#define DECLARE_VALUE(NAME) VALUE_TYPE NAME
+#define INCREF_VALUE(k) Py_INCREF(k)
+#define DECREF_VALUE(k) Py_DECREF(k)
+#define COPY_VALUE(k,e) k=(e)
+#define COPY_VALUE_TO_OBJECT(O, K) O=(K); Py_INCREF(O)
+#define COPY_VALUE_FROM_ARG(TARGET, ARG, S) TARGET=(ARG)
+