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

Reindented.

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