Commit 6f6f4a30 authored by Tim Peters's avatar Tim Peters

Just whitespace changes.

parent a30830a0
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
Set operations Set operations
****************************************************************************/ ****************************************************************************/
#define SETOPTEMPLATE_C "$Id: SetOpTemplate.c,v 1.22 2002/06/07 06:44:01 tim_one Exp $\n" #define SETOPTEMPLATE_C "$Id: SetOpTemplate.c,v 1.23 2002/06/08 02:37:58 tim_one Exp $\n"
#ifdef INTSET_H #ifdef INTSET_H
static int static int
...@@ -92,63 +92,63 @@ initSetIteration(SetIteration *i, PyObject *s, int w, int *merge) ...@@ -92,63 +92,63 @@ initSetIteration(SetIteration *i, PyObject *s, int w, int *merge)
if (w >= 0) if (w >= 0)
{ {
*merge=1; *merge = 1;
i->next=nextBucket; i->next = nextBucket;
} }
else else
i->next=nextSet; i->next = nextSet;
i->hasValue=1; i->hasValue = 1;
} }
else if (ExtensionClassSubclassInstance_Check(s, &SetType)) else if (ExtensionClassSubclassInstance_Check(s, &SetType))
{ {
i->set = s; i->set = s;
Py_INCREF(s); Py_INCREF(s);
i->next=nextSet; i->next = nextSet;
i->hasValue=0; i->hasValue = 0;
} }
else if (ExtensionClassSubclassInstance_Check(s, &BTreeType)) else if (ExtensionClassSubclassInstance_Check(s, &BTreeType))
{ {
i->set=BTree_rangeSearch(BTREE(s), NULL, 'i'); i->set = BTree_rangeSearch(BTREE(s), NULL, 'i');
UNLESS(i->set) return -1; UNLESS(i->set) return -1;
if (w >= 0) if (w >= 0)
{ {
*merge=1; *merge = 1;
i->next=nextBTreeItems; i->next = nextBTreeItems;
} }
else else
i->next=nextTreeSetItems; i->next = nextTreeSetItems;
i->hasValue=1; i->hasValue = 1;
} }
else if (ExtensionClassSubclassInstance_Check(s, &TreeSetType)) else if (ExtensionClassSubclassInstance_Check(s, &TreeSetType))
{ {
i->set=BTree_rangeSearch(BTREE(s), NULL, 'k'); i->set = BTree_rangeSearch(BTREE(s), NULL, 'k');
UNLESS(i->set) return -1; UNLESS(i->set) return -1;
i->next=nextTreeSetItems; i->next = nextTreeSetItems;
i->hasValue=0; i->hasValue = 0;
} }
#ifdef INTSET_H #ifdef INTSET_H
else if (s->ob_type==(PyTypeObject*)intSetType) else if (s->ob_type == (PyTypeObject*)intSetType)
{ {
i->set = s; i->set = s;
Py_INCREF(s); Py_INCREF(s);
i->next=nextIntSet; i->next = nextIntSet;
i->hasValue=0; i->hasValue = 0;
} }
#endif #endif
#ifdef KEY_CHECK #ifdef KEY_CHECK
else if (KEY_CHECK(s)) else if (KEY_CHECK(s))
{ {
int copied=1; int copied = 1;
i->set = s; i->set = s;
Py_INCREF(s); Py_INCREF(s);
i->next=nextKeyAsSet; i->next=nextKeyAsSet;
i->hasValue=0; i->hasValue = 0;
COPY_KEY_FROM_ARG(i->key, s, copied); COPY_KEY_FROM_ARG(i->key, s, copied);
UNLESS (copied) return -1; UNLESS (copied) return -1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment