Commit 0ffa6aa9 authored by Jim Fulton's avatar Jim Fulton

Reindented.

parent 55ed9237
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
FOR A PARTICULAR PURPOSE FOR A PARTICULAR PURPOSE
****************************************************************************/ ****************************************************************************/
#define MERGETEMPLATE_C "$Id$\n" #define MERGETEMPLATE_C "$Id$\n"
/**************************************************************************** /****************************************************************************
Set operations Set operations
****************************************************************************/ ****************************************************************************/
static int static int
merge_output(Bucket *r, SetIteration *i, int mapping) merge_output(Bucket *r, SetIteration *i, int mapping)
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
FOR A PARTICULAR PURPOSE FOR A PARTICULAR PURPOSE
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
Set operations Set operations
****************************************************************************/ ****************************************************************************/
#define SETOPTEMPLATE_C "$Id$\n" #define SETOPTEMPLATE_C "$Id$\n"
...@@ -145,7 +145,7 @@ initSetIteration(SetIteration *i, PyObject *s, int useValues) ...@@ -145,7 +145,7 @@ initSetIteration(SetIteration *i, PyObject *s, int useValues)
static int static int
copyRemaining(Bucket *r, SetIteration *i, int merge, copyRemaining(Bucket *r, SetIteration *i, int merge,
/* See comment # 42 */ /* See comment # 42 */
#ifdef MERGE #ifdef MERGE
VALUE_TYPE w) VALUE_TYPE w)
#else #else
...@@ -201,16 +201,16 @@ static PyObject * ...@@ -201,16 +201,16 @@ static PyObject *
set_operation(PyObject *s1, PyObject *s2, set_operation(PyObject *s1, PyObject *s2,
int usevalues1, int usevalues2, int usevalues1, int usevalues2,
/* Comment # 42 /* Comment # 42
The following ifdef works around a template/type problem The following ifdef works around a template/type problem
Weights are passed as integers. In particular, the weight passed by Weights are passed as integers. In particular, the weight passed by
difference is one. This works fine in the int value and float value difference is one. This works fine in the int value and float value
cases but makes no sense in the object value case. In the object cases but makes no sense in the object value case. In the object
value case, we don't do merging, so we don't use the weights, so it value case, we don't do merging, so we don't use the weights, so it
doesn't matter what they are. doesn't matter what they are.
*/ */
#ifdef MERGE #ifdef MERGE
VALUE_TYPE w1, VALUE_TYPE w2, VALUE_TYPE w1, VALUE_TYPE w2,
#else #else
...@@ -238,7 +238,7 @@ doesn't matter what they are. ...@@ -238,7 +238,7 @@ doesn't matter what they are.
SetIteration t; SetIteration t;
int i; int i;
/* See comment # 42 above */ /* See comment # 42 above */
#ifdef MERGE #ifdef MERGE
VALUE_TYPE v; VALUE_TYPE v;
#else #else
...@@ -342,11 +342,11 @@ doesn't matter what they are. ...@@ -342,11 +342,11 @@ doesn't matter what they are.
return OBJECT(r); return OBJECT(r);
#ifndef MERGE_DEFAULT #ifndef MERGE_DEFAULT
invalid_set_operation: invalid_set_operation:
PyErr_SetString(PyExc_TypeError, "invalid set operation"); PyErr_SetString(PyExc_TypeError, "invalid set operation");
#endif #endif
err: err:
finiSetIteration(&i1); finiSetIteration(&i1);
finiSetIteration(&i2); finiSetIteration(&i2);
Py_XDECREF(r); Py_XDECREF(r);
...@@ -548,7 +548,7 @@ multiunion_m(PyObject *ignored, PyObject *args) ...@@ -548,7 +548,7 @@ multiunion_m(PyObject *ignored, PyObject *args)
} }
return (PyObject *)result; return (PyObject *)result;
Error: Error:
Py_DECREF(result); Py_DECREF(result);
Py_XDECREF(set); Py_XDECREF(set);
finiSetIteration(&setiter); finiSetIteration(&setiter);
......
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