[Python-checkins] CVS: python/dist/src/Objects abstract.c,2.38,2.39 bufferobject.c,2.10,2.11 classobject.c,2.99,2.100
Fred L. Drake
python-dev@python.org
Sat, 8 Jul 2000 21:06:14 -0700
Update of /cvsroot/python/python/dist/src/Objects
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19308
Modified Files:
abstract.c bufferobject.c classobject.c
Log Message:
ANSI-fication of the sources.
Index: abstract.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/abstract.c,v
retrieving revision 2.38
retrieving revision 2.39
diff -C2 -r2.38 -r2.39
*** abstract.c 2000/07/09 03:09:56 2.38
--- abstract.c 2000/07/09 04:06:11 2.39
***************
*** 17,22 ****
static PyObject *
! type_error(msg)
! char *msg;
{
PyErr_SetString(PyExc_TypeError, msg);
--- 17,21 ----
static PyObject *
! type_error(char *msg)
{
PyErr_SetString(PyExc_TypeError, msg);
***************
*** 25,29 ****
static PyObject *
! null_error()
{
if (!PyErr_Occurred())
--- 24,28 ----
static PyObject *
! null_error(void)
{
if (!PyErr_Occurred())
***************
*** 36,43 ****
int
! PyObject_Cmp(o1, o2, result)
! PyObject *o1;
! PyObject *o2;
! int *result;
{
int r;
--- 35,39 ----
int
! PyObject_Cmp(PyObject *o1, PyObject *o2, int *result)
{
int r;
***************
*** 55,60 ****
PyObject *
! PyObject_Type(o)
! PyObject *o;
{
PyObject *v;
--- 51,55 ----
PyObject *
! PyObject_Type(PyObject *o)
{
PyObject *v;
***************
*** 68,73 ****
int
! PyObject_Length(o)
! PyObject *o;
{
PySequenceMethods *m;
--- 63,67 ----
int
! PyObject_Length(PyObject *o)
{
PySequenceMethods *m;
***************
*** 86,92 ****
PyObject *
! PyObject_GetItem(o, key)
! PyObject *o;
! PyObject *key;
{
PyMappingMethods *m;
--- 80,84 ----
PyObject *
! PyObject_GetItem(PyObject *o, PyObject *key)
{
PyMappingMethods *m;
***************
*** 115,122 ****
int
! PyObject_SetItem(o, key, value)
! PyObject *o;
! PyObject *key;
! PyObject *value;
{
PyMappingMethods *m;
--- 107,111 ----
int
! PyObject_SetItem(PyObject *o, PyObject *key, PyObject *value)
{
PyMappingMethods *m;
***************
*** 148,154 ****
int
! PyObject_DelItem(o, key)
! PyObject *o;
! PyObject *key;
{
PyMappingMethods *m;
--- 137,141 ----
int
! PyObject_DelItem(PyObject *o, PyObject *key)
{
PyMappingMethods *m;
***************
*** 290,295 ****
int
! PyNumber_Check(o)
! PyObject *o;
{
return o && o->ob_type->tp_as_number;
--- 277,281 ----
int
! PyNumber_Check(PyObject *o)
{
return o && o->ob_type->tp_as_number;
***************
*** 303,308 ****
PyObject *
! PyNumber_Or(v, w)
! PyObject *v, *w;
{
extern int PyNumber_Coerce();
--- 289,293 ----
PyObject *
! PyNumber_Or(PyObject *v, PyObject *w)
{
extern int PyNumber_Coerce();
***************
*** 325,330 ****
PyObject *
! PyNumber_Xor(v, w)
! PyObject *v, *w;
{
extern int PyNumber_Coerce();
--- 310,314 ----
PyObject *
! PyNumber_Xor(PyObject *v, PyObject *w)
{
extern int PyNumber_Coerce();
***************
*** 347,352 ****
PyObject *
! PyNumber_And(v, w)
! PyObject *v, *w;
{
BINOP(v, w, "__and__", "__rand__", PyNumber_And);
--- 331,335 ----
PyObject *
! PyNumber_And(PyObject *v, PyObject *w)
{
BINOP(v, w, "__and__", "__rand__", PyNumber_And);
***************
*** 367,372 ****
PyObject *
! PyNumber_Lshift(v, w)
! PyObject *v, *w;
{
BINOP(v, w, "__lshift__", "__rlshift__", PyNumber_Lshift);
--- 350,354 ----
PyObject *
! PyNumber_Lshift(PyObject *v, PyObject *w)
{
BINOP(v, w, "__lshift__", "__rlshift__", PyNumber_Lshift);
***************
*** 387,392 ****
PyObject *
! PyNumber_Rshift(v, w)
! PyObject *v, *w;
{
BINOP(v, w, "__rshift__", "__rrshift__", PyNumber_Rshift);
--- 369,373 ----
PyObject *
! PyNumber_Rshift(PyObject *v, PyObject *w)
{
BINOP(v, w, "__rshift__", "__rrshift__", PyNumber_Rshift);
***************
*** 407,412 ****
PyObject *
! PyNumber_Add(v, w)
! PyObject *v, *w;
{
PySequenceMethods *m;
--- 388,392 ----
PyObject *
! PyNumber_Add(PyObject *v, PyObject *w)
{
PySequenceMethods *m;
***************
*** 432,437 ****
PyObject *
! PyNumber_Subtract(v, w)
! PyObject *v, *w;
{
BINOP(v, w, "__sub__", "__rsub__", PyNumber_Subtract);
--- 412,416 ----
PyObject *
! PyNumber_Subtract(PyObject *v, PyObject *w)
{
BINOP(v, w, "__sub__", "__rsub__", PyNumber_Subtract);
***************
*** 452,457 ****
PyObject *
! PyNumber_Multiply(v, w)
! PyObject *v, *w;
{
PyTypeObject *tp = v->ob_type;
--- 431,435 ----
PyObject *
! PyNumber_Multiply(PyObject *v, PyObject *w)
{
PyTypeObject *tp = v->ob_type;
***************
*** 510,515 ****
PyObject *
! PyNumber_Divide(v, w)
! PyObject *v, *w;
{
BINOP(v, w, "__div__", "__rdiv__", PyNumber_Divide);
--- 488,492 ----
PyObject *
! PyNumber_Divide(PyObject *v, PyObject *w)
{
BINOP(v, w, "__div__", "__rdiv__", PyNumber_Divide);
***************
*** 530,535 ****
PyObject *
! PyNumber_Remainder(v, w)
! PyObject *v, *w;
{
if (PyString_Check(v))
--- 507,511 ----
PyObject *
! PyNumber_Remainder(PyObject *v, PyObject *w)
{
if (PyString_Check(v))
***************
*** 554,559 ****
PyObject *
! PyNumber_Divmod(v, w)
! PyObject *v, *w;
{
BINOP(v, w, "__divmod__", "__rdivmod__", PyNumber_Divmod);
--- 530,534 ----
PyObject *
! PyNumber_Divmod(PyObject *v, PyObject *w)
{
BINOP(v, w, "__divmod__", "__rdivmod__", PyNumber_Divmod);
***************
*** 576,581 ****
static PyObject *
! do_pow(v, w)
! PyObject *v, *w;
{
PyObject *res;
--- 551,555 ----
static PyObject *
! do_pow(PyObject *v, PyObject *w)
{
PyObject *res;
***************
*** 600,605 ****
PyObject *
! PyNumber_Power(v, w, z)
! PyObject *v, *w, *z;
{
PyObject *res;
--- 574,578 ----
PyObject *
! PyNumber_Power(PyObject *v, PyObject *w, PyObject *z)
{
PyObject *res;
***************
*** 647,652 ****
PyObject *
! PyNumber_Negative(o)
! PyObject *o;
{
PyNumberMethods *m;
--- 620,624 ----
PyObject *
! PyNumber_Negative(PyObject *o)
{
PyNumberMethods *m;
***************
*** 662,667 ****
PyObject *
! PyNumber_Positive(o)
! PyObject *o;
{
PyNumberMethods *m;
--- 634,638 ----
PyObject *
! PyNumber_Positive(PyObject *o)
{
PyNumberMethods *m;
***************
*** 677,682 ****
PyObject *
! PyNumber_Invert(o)
! PyObject *o;
{
PyNumberMethods *m;
--- 648,652 ----
PyObject *
! PyNumber_Invert(PyObject *o)
{
PyNumberMethods *m;
***************
*** 692,697 ****
PyObject *
! PyNumber_Absolute(o)
! PyObject *o;
{
PyNumberMethods *m;
--- 662,666 ----
PyObject *
! PyNumber_Absolute(PyObject *o)
{
PyNumberMethods *m;
***************
*** 708,714 ****
/* Add a check for embedded NULL-bytes in the argument. */
static PyObject *
! int_from_string(s, len)
! const char *s;
! int len;
{
char *end;
--- 677,681 ----
/* Add a check for embedded NULL-bytes in the argument. */
static PyObject *
! int_from_string(const char *s, int len)
{
char *end;
***************
*** 728,733 ****
PyObject *
! PyNumber_Int(o)
! PyObject *o;
{
PyNumberMethods *m;
--- 695,699 ----
PyObject *
! PyNumber_Int(PyObject *o)
{
PyNumberMethods *m;
***************
*** 759,765 ****
/* Add a check for embedded NULL-bytes in the argument. */
static PyObject *
! long_from_string(s, len)
! const char *s;
! int len;
{
char *end;
--- 725,729 ----
/* Add a check for embedded NULL-bytes in the argument. */
static PyObject *
! long_from_string(const char *s, int len)
{
char *end;
***************
*** 779,784 ****
PyObject *
! PyNumber_Long(o)
! PyObject *o;
{
PyNumberMethods *m;
--- 743,747 ----
PyObject *
! PyNumber_Long(PyObject *o)
{
PyNumberMethods *m;
***************
*** 814,819 ****
PyObject *
! PyNumber_Float(o)
! PyObject *o;
{
PyNumberMethods *m;
--- 777,781 ----
PyObject *
! PyNumber_Float(PyObject *o)
{
PyNumberMethods *m;
***************
*** 836,841 ****
int
! PySequence_Check(s)
! PyObject *s;
{
return s != NULL && s->ob_type->tp_as_sequence;
--- 798,802 ----
int
! PySequence_Check(PyObject *s)
{
return s != NULL && s->ob_type->tp_as_sequence;
***************
*** 843,848 ****
int
! PySequence_Length(s)
! PyObject *s;
{
PySequenceMethods *m;
--- 804,808 ----
int
! PySequence_Length(PyObject *s)
{
PySequenceMethods *m;
***************
*** 862,868 ****
PyObject *
! PySequence_Concat(s, o)
! PyObject *s;
! PyObject *o;
{
PySequenceMethods *m;
--- 822,826 ----
PyObject *
! PySequence_Concat(PyObject *s, PyObject *o)
{
PySequenceMethods *m;
***************
*** 879,885 ****
PyObject *
! PySequence_Repeat(o, count)
! PyObject *o;
! int count;
{
PySequenceMethods *m;
--- 837,841 ----
PyObject *
! PySequence_Repeat(PyObject *o, int count)
{
PySequenceMethods *m;
***************
*** 896,902 ****
PyObject *
! PySequence_GetItem(s, i)
! PyObject *s;
! int i;
{
PySequenceMethods *m;
--- 852,856 ----
PyObject *
! PySequence_GetItem(PyObject *s, int i)
{
PySequenceMethods *m;
***************
*** 922,929 ****
PyObject *
! PySequence_GetSlice(s, i1, i2)
! PyObject *s;
! int i1;
! int i2;
{
PySequenceMethods *m;
--- 876,880 ----
PyObject *
! PySequence_GetSlice(PyObject *s, int i1, int i2)
{
PySequenceMethods *m;
***************
*** 951,958 ****
int
! PySequence_SetItem(s, i, o)
! PyObject *s;
! int i;
! PyObject *o;
{
PySequenceMethods *m;
--- 902,906 ----
int
! PySequence_SetItem(PyObject *s, int i, PyObject *o)
{
PySequenceMethods *m;
***************
*** 981,987 ****
int
! PySequence_DelItem(s, i)
! PyObject *s;
! int i;
{
PySequenceMethods *m;
--- 929,933 ----
int
! PySequence_DelItem(PyObject *s, int i)
{
PySequenceMethods *m;
***************
*** 1010,1018 ****
int
! PySequence_SetSlice(s, i1, i2, o)
! PyObject *s;
! int i1;
! int i2;
! PyObject *o;
{
PySequenceMethods *m;
--- 956,960 ----
int
! PySequence_SetSlice(PyObject *s, int i1, int i2, PyObject *o)
{
PySequenceMethods *m;
***************
*** 1043,1050 ****
int
! PySequence_DelSlice(s, i1, i2)
! PyObject *s;
! int i1;
! int i2;
{
PySequenceMethods *m;
--- 985,989 ----
int
! PySequence_DelSlice(PyObject *s, int i1, int i2)
{
PySequenceMethods *m;
***************
*** 1075,1080 ****
PyObject *
! PySequence_Tuple(v)
! PyObject *v;
{
PySequenceMethods *m;
--- 1014,1018 ----
PyObject *
! PySequence_Tuple(PyObject *v)
{
PySequenceMethods *m;
***************
*** 1136,1141 ****
PyObject *
! PySequence_List(v)
! PyObject *v;
{
PySequenceMethods *m;
--- 1074,1078 ----
PyObject *
! PySequence_List(PyObject *v)
{
PySequenceMethods *m;
***************
*** 1188,1194 ****
PyObject *
! PySequence_Fast(v, m)
! PyObject *v;
! const char* m;
{
if (v == NULL)
--- 1125,1129 ----
PyObject *
! PySequence_Fast(PyObject *v, const char *m)
{
if (v == NULL)
***************
*** 1208,1214 ****
int
! PySequence_Count(s, o)
! PyObject *s;
! PyObject *o;
{
int l, i, n, cmp, err;
--- 1143,1147 ----
int
! PySequence_Count(PyObject *s, PyObject *o)
{
int l, i, n, cmp, err;
***************
*** 1240,1246 ****
int
! PySequence_Contains(w, v) /* v in w */
! PyObject *w;
! PyObject *v;
{
int i, cmp;
--- 1173,1177 ----
int
! PySequence_Contains(PyObject *w, PyObject *v) /* v in w */
{
int i, cmp;
***************
*** 1286,1292 ****
#undef PySequence_In
int
! PySequence_In(w, v)
! PyObject *w;
! PyObject *v;
{
return PySequence_Contains(w, v);
--- 1217,1221 ----
#undef PySequence_In
int
! PySequence_In(PyObject *w, PyObject *v)
{
return PySequence_Contains(w, v);
***************
*** 1294,1300 ****
int
! PySequence_Index(s, o)
! PyObject *s;
! PyObject *o;
{
int l, i, cmp, err;
--- 1223,1227 ----
int
! PySequence_Index(PyObject *s, PyObject *o)
{
int l, i, cmp, err;
***************
*** 1329,1334 ****
int
! PyMapping_Check(o)
! PyObject *o;
{
return o && o->ob_type->tp_as_mapping;
--- 1256,1260 ----
int
! PyMapping_Check(PyObject *o)
{
return o && o->ob_type->tp_as_mapping;
***************
*** 1336,1341 ****
int
! PyMapping_Length(o)
! PyObject *o;
{
PyMappingMethods *m;
--- 1262,1266 ----
int
! PyMapping_Length(PyObject *o)
{
PyMappingMethods *m;
***************
*** 1355,1361 ****
PyObject *
! PyMapping_GetItemString(o, key)
! PyObject *o;
! char *key;
{
PyObject *okey, *r;
--- 1280,1284 ----
PyObject *
! PyMapping_GetItemString(PyObject *o, char *key)
{
PyObject *okey, *r;
***************
*** 1373,1380 ****
int
! PyMapping_SetItemString(o, key, value)
! PyObject *o;
! char *key;
! PyObject *value;
{
PyObject *okey;
--- 1296,1300 ----
int
! PyMapping_SetItemString(PyObject *o, char *key, PyObject *value)
{
PyObject *okey;
***************
*** 1395,1401 ****
int
! PyMapping_HasKeyString(o, key)
! PyObject *o;
! char *key;
{
PyObject *v;
--- 1315,1319 ----
int
! PyMapping_HasKeyString(PyObject *o, char *key)
{
PyObject *v;
***************
*** 1411,1417 ****
int
! PyMapping_HasKey(o, key)
! PyObject *o;
! PyObject *key;
{
PyObject *v;
--- 1329,1333 ----
int
! PyMapping_HasKey(PyObject *o, PyObject *key)
{
PyObject *v;
***************
*** 1431,1436 ****
PyObject *
! PyObject_CallObject(o, a)
! PyObject *o, *a;
{
PyObject *r;
--- 1347,1351 ----
PyObject *
! PyObject_CallObject(PyObject *o, PyObject *a)
{
PyObject *r;
Index: bufferobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/bufferobject.c,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -r2.10 -r2.11
*** bufferobject.c 2000/06/30 23:58:05 2.10
--- bufferobject.c 2000/07/09 04:06:11 2.11
***************
*** 27,35 ****
static PyObject *
! _PyBuffer_FromMemory(base, ptr, size, readonly)
! PyObject *base;
! void *ptr;
! int size;
! int readonly;
{
PyBufferObject * b;
--- 27,31 ----
static PyObject *
! _PyBuffer_FromMemory(PyObject *base, void *ptr, int size, int readonly)
{
PyBufferObject * b;
***************
*** 58,67 ****
static PyObject *
! _PyBuffer_FromObject(base, offset, size, proc, readonly)
! PyObject *base;
! int offset;
! int size;
! getreadbufferproc proc;
! int readonly;
{
PyBufferProcs *pb = base->ob_type->tp_as_buffer;
--- 54,59 ----
static PyObject *
! _PyBuffer_FromObject(PyObject *base, int offset, int size,
! getreadbufferproc proc, int readonly)
{
PyBufferProcs *pb = base->ob_type->tp_as_buffer;
***************
*** 101,108 ****
PyObject *
! PyBuffer_FromObject(base, offset, size)
! PyObject *base;
! int offset;
! int size;
{
PyBufferProcs *pb = base->ob_type->tp_as_buffer;
--- 93,97 ----
PyObject *
! PyBuffer_FromObject(PyObject *base, int offset, int size)
{
PyBufferProcs *pb = base->ob_type->tp_as_buffer;
***************
*** 121,128 ****
PyObject *
! PyBuffer_FromReadWriteObject(base, offset, size)
! PyObject *base;
! int offset;
! int size;
{
PyBufferProcs *pb = base->ob_type->tp_as_buffer;
--- 110,114 ----
PyObject *
! PyBuffer_FromReadWriteObject(PyObject *base, int offset, int size)
{
PyBufferProcs *pb = base->ob_type->tp_as_buffer;
***************
*** 142,148 ****
PyObject *
! PyBuffer_FromMemory(ptr, size)
! void *ptr;
! int size;
{
return _PyBuffer_FromMemory(NULL, ptr, size, 1);
--- 128,132 ----
PyObject *
! PyBuffer_FromMemory(void *ptr, int size)
{
return _PyBuffer_FromMemory(NULL, ptr, size, 1);
***************
*** 150,156 ****
PyObject *
! PyBuffer_FromReadWriteMemory(ptr, size)
! void *ptr;
! int size;
{
return _PyBuffer_FromMemory(NULL, ptr, size, 0);
--- 134,138 ----
PyObject *
! PyBuffer_FromReadWriteMemory(void *ptr, int size)
{
return _PyBuffer_FromMemory(NULL, ptr, size, 0);
***************
*** 158,163 ****
PyObject *
! PyBuffer_New(size)
! int size;
{
PyBufferObject * b;
--- 140,144 ----
PyObject *
! PyBuffer_New(int size)
{
PyBufferObject * b;
***************
*** 188,193 ****
static void
! buffer_dealloc(self)
! PyBufferObject *self;
{
Py_XDECREF(self->b_base);
--- 169,173 ----
static void
! buffer_dealloc(PyBufferObject *self)
{
Py_XDECREF(self->b_base);
***************
*** 196,202 ****
static int
! buffer_compare(self, other)
! PyBufferObject *self;
! PyBufferObject *other;
{
int len_self = self->b_size;
--- 176,180 ----
static int
! buffer_compare(PyBufferObject *self, PyBufferObject *other)
{
int len_self = self->b_size;
***************
*** 213,218 ****
static PyObject *
! buffer_repr(self)
! PyBufferObject *self;
{
char buf[300];
--- 191,195 ----
static PyObject *
! buffer_repr(PyBufferObject *self)
{
char buf[300];
***************
*** 241,246 ****
static long
! buffer_hash(self)
! PyBufferObject *self;
{
register int len;
--- 218,222 ----
static long
! buffer_hash(PyBufferObject *self)
{
register int len;
***************
*** 275,280 ****
static PyObject *
! buffer_str(self)
! PyBufferObject *self;
{
return PyString_FromStringAndSize(self->b_ptr, self->b_size);
--- 251,255 ----
static PyObject *
! buffer_str(PyBufferObject *self)
{
return PyString_FromStringAndSize(self->b_ptr, self->b_size);
***************
*** 284,289 ****
static int
! buffer_length(self)
! PyBufferObject *self;
{
return self->b_size;
--- 259,263 ----
static int
! buffer_length(PyBufferObject *self)
{
return self->b_size;
***************
*** 291,297 ****
static PyObject *
! buffer_concat(self, other)
! PyBufferObject *self;
! PyObject *other;
{
PyBufferProcs *pb = other->ob_type->tp_as_buffer;
--- 265,269 ----
static PyObject *
! buffer_concat(PyBufferObject *self, PyObject *other)
{
PyBufferProcs *pb = other->ob_type->tp_as_buffer;
***************
*** 345,351 ****
static PyObject *
! buffer_repeat(self, count)
! PyBufferObject *self;
! int count;
{
PyObject *ob;
--- 317,321 ----
static PyObject *
! buffer_repeat(PyBufferObject *self, int count)
{
PyObject *ob;
***************
*** 374,380 ****
static PyObject *
! buffer_item(self, idx)
! PyBufferObject *self;
! int idx;
{
if ( idx < 0 || idx >= self->b_size )
--- 344,348 ----
static PyObject *
! buffer_item(PyBufferObject *self, int idx)
{
if ( idx < 0 || idx >= self->b_size )
***************
*** 387,394 ****
static PyObject *
! buffer_slice(self, left, right)
! PyBufferObject *self;
! int left;
! int right;
{
if ( left < 0 )
--- 355,359 ----
static PyObject *
! buffer_slice(PyBufferObject *self, int left, int right)
{
if ( left < 0 )
***************
*** 411,418 ****
static int
! buffer_ass_item(self, idx, other)
! PyBufferObject *self;
! int idx;
! PyObject *other;
{
PyBufferProcs *pb;
--- 376,380 ----
static int
! buffer_ass_item(PyBufferObject *self, int idx, PyObject *other)
{
PyBufferProcs *pb;
***************
*** 461,469 ****
static int
! buffer_ass_slice(self, left, right, other)
! PyBufferObject *self;
! int left;
! int right;
! PyObject *other;
{
PyBufferProcs *pb;
--- 423,427 ----
static int
! buffer_ass_slice(PyBufferObject *self, int left, int right, PyObject *other)
{
PyBufferProcs *pb;
***************
*** 522,529 ****
static int
! buffer_getreadbuf(self, idx, pp)
! PyBufferObject *self;
! int idx;
! void ** pp;
{
if ( idx != 0 ) {
--- 480,484 ----
static int
! buffer_getreadbuf(PyBufferObject *self, int idx, void **pp)
{
if ( idx != 0 ) {
***************
*** 537,544 ****
static int
! buffer_getwritebuf(self, idx, pp)
! PyBufferObject *self;
! int idx;
! void ** pp;
{
if ( self->b_readonly )
--- 492,496 ----
static int
! buffer_getwritebuf(PyBufferObject *self, int idx, void **pp)
{
if ( self->b_readonly )
***************
*** 551,557 ****
static int
! buffer_getsegcount(self, lenp)
! PyBufferObject *self;
! int *lenp;
{
if ( lenp )
--- 503,507 ----
static int
! buffer_getsegcount(PyBufferObject *self, int *lenp)
{
if ( lenp )
***************
*** 561,568 ****
static int
! buffer_getcharbuf(self, idx, pp)
! PyBufferObject *self;
! int idx;
! const char ** pp;
{
if ( idx != 0 ) {
--- 511,515 ----
static int
! buffer_getcharbuf(PyBufferObject *self, int idx, const char **pp)
{
if ( idx != 0 ) {
***************
*** 617,619 ****
0, /*tp_doc*/
};
-
--- 564,565 ----
Index: classobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/classobject.c,v
retrieving revision 2.99
retrieving revision 2.100
diff -C2 -r2.99 -r2.100
*** classobject.c 2000/07/09 03:09:56 2.99
--- classobject.c 2000/07/09 04:06:11 2.100
***************
*** 22,30 ****
static PyObject *getattrstr, *setattrstr, *delattrstr;
PyObject *
! PyClass_New(bases, dict, name)
! PyObject *bases; /* NULL or tuple of classobjects! */
! PyObject *dict;
! PyObject *name;
{
PyClassObject *op, *dummy;
--- 22,29 ----
static PyObject *getattrstr, *setattrstr, *delattrstr;
+
PyObject *
! PyClass_New(PyObject *bases, PyObject *dict, PyObject *name)
! /* bases is NULL or tuple of classobjects! */
{
PyClassObject *op, *dummy;
***************
*** 119,124 ****
static void
! class_dealloc(op)
! PyClassObject *op;
{
PyObject_GC_Fini(op);
--- 118,122 ----
static void
! class_dealloc(PyClassObject *op)
{
PyObject_GC_Fini(op);
***************
*** 134,141 ****
static PyObject *
! class_lookup(cp, name, pclass)
! PyClassObject *cp;
! PyObject *name;
! PyClassObject **pclass;
{
int i, n;
--- 132,136 ----
static PyObject *
! class_lookup(PyClassObject *cp, PyObject *name, PyClassObject **pclass)
{
int i, n;
***************
*** 158,164 ****
static PyObject *
! class_getattr(op, name)
! register PyClassObject *op;
! PyObject *name;
{
register PyObject *v;
--- 153,157 ----
static PyObject *
! class_getattr(register PyClassObject *op, PyObject *name)
{
register PyObject *v;
***************
*** 204,210 ****
static void
! set_slot(slot, v)
! PyObject **slot;
! PyObject *v;
{
PyObject *temp = *slot;
--- 197,201 ----
static void
! set_slot(PyObject **slot, PyObject *v)
{
PyObject *temp = *slot;
***************
*** 215,220 ****
static void
! set_attr_slots(c)
! PyClassObject *c;
{
PyClassObject *dummy;
--- 206,210 ----
static void
! set_attr_slots(PyClassObject *c)
{
PyClassObject *dummy;
***************
*** 226,232 ****
static char *
! set_dict(c, v)
! PyClassObject *c;
! PyObject *v;
{
if (v == NULL || !PyDict_Check(v))
--- 216,220 ----
static char *
! set_dict(PyClassObject *c, PyObject *v)
{
if (v == NULL || !PyDict_Check(v))
***************
*** 238,244 ****
static char *
! set_bases(c, v)
! PyClassObject *c;
! PyObject *v;
{
int i, n;
--- 226,230 ----
static char *
! set_bases(PyClassObject *c, PyObject *v)
{
int i, n;
***************
*** 260,266 ****
static char *
! set_name(c, v)
! PyClassObject *c;
! PyObject *v;
{
if (v == NULL || !PyString_Check(v))
--- 246,250 ----
static char *
! set_name(PyClassObject *c, PyObject *v)
{
if (v == NULL || !PyString_Check(v))
***************
*** 273,280 ****
static int
! class_setattr(op, name, v)
! PyClassObject *op;
! PyObject *name;
! PyObject *v;
{
char *sname;
--- 257,261 ----
static int
! class_setattr(PyClassObject *op, PyObject *name, PyObject *v)
{
char *sname;
***************
*** 323,328 ****
static PyObject *
! class_repr(op)
! PyClassObject *op;
{
PyObject *mod = PyDict_GetItemString(op->cl_dict, "__module__");
--- 304,308 ----
static PyObject *
! class_repr(PyClassObject *op)
{
PyObject *mod = PyDict_GetItemString(op->cl_dict, "__module__");
***************
*** 343,348 ****
static PyObject *
! class_str(op)
! PyClassObject *op;
{
PyObject *mod = PyDict_GetItemString(op->cl_dict, "__module__");
--- 323,327 ----
static PyObject *
! class_str(PyClassObject *op)
{
PyObject *mod = PyDict_GetItemString(op->cl_dict, "__module__");
***************
*** 434,440 ****
int
! PyClass_IsSubclass(class, base)
! PyObject *class;
! PyObject *base;
{
int i, n;
--- 413,417 ----
int
! PyClass_IsSubclass(PyObject *class, PyObject *base)
{
int i, n;
***************
*** 457,464 ****
PyObject *
! PyInstance_New(class, arg, kw)
! PyObject *class;
! PyObject *arg;
! PyObject *kw;
{
register PyInstanceObject *inst;
--- 434,438 ----
PyObject *
! PyInstance_New(PyObject *class, PyObject *arg, PyObject *kw)
{
register PyInstanceObject *inst;
***************
*** 518,523 ****
static void
! instance_dealloc(inst)
! register PyInstanceObject *inst;
{
PyObject *error_type, *error_value, *error_traceback;
--- 492,496 ----
static void
! instance_dealloc(register PyInstanceObject *inst)
{
PyObject *error_type, *error_value, *error_traceback;
***************
*** 598,604 ****
static PyObject *
! instance_getattr1(inst, name)
! register PyInstanceObject *inst;
! PyObject *name;
{
register PyObject *v;
--- 571,575 ----
static PyObject *
! instance_getattr1(register PyInstanceObject *inst, PyObject *name)
{
register PyObject *v;
***************
*** 628,634 ****
static PyObject *
! instance_getattr2(inst, name)
! register PyInstanceObject *inst;
! PyObject *name;
{
register PyObject *v;
--- 599,603 ----
static PyObject *
! instance_getattr2(register PyInstanceObject *inst, PyObject *name)
{
register PyObject *v;
***************
*** 665,671 ****
static PyObject *
! instance_getattr(inst, name)
! register PyInstanceObject *inst;
! PyObject *name;
{
register PyObject *func, *res;
--- 634,638 ----
static PyObject *
! instance_getattr(register PyInstanceObject *inst, PyObject *name)
{
register PyObject *func, *res;
***************
*** 684,691 ****
static int
! instance_setattr1(inst, name, v)
! PyInstanceObject *inst;
! PyObject *name;
! PyObject *v;
{
if (v == NULL) {
--- 651,655 ----
static int
! instance_setattr1(PyInstanceObject *inst, PyObject *name, PyObject *v)
{
if (v == NULL) {
***************
*** 701,708 ****
static int
! instance_setattr(inst, name, v)
! PyInstanceObject *inst;
! PyObject *name;
! PyObject *v;
{
PyObject *func, *args, *res, *tmp;
--- 665,669 ----
static int
! instance_setattr(PyInstanceObject *inst, PyObject *name, PyObject *v)
{
PyObject *func, *args, *res, *tmp;
***************
*** 768,773 ****
static PyObject *
! instance_repr(inst)
! PyInstanceObject *inst;
{
PyObject *func;
--- 729,733 ----
static PyObject *
! instance_repr(PyInstanceObject *inst)
{
PyObject *func;
***************
*** 804,809 ****
static PyObject *
! instance_compare1(inst, other)
! PyObject *inst, *other;
{
return PyInstance_DoBinOp(inst, other, "__cmp__", "__rcmp__",
--- 764,768 ----
static PyObject *
! instance_compare1(PyObject *inst, PyObject *other)
{
return PyInstance_DoBinOp(inst, other, "__cmp__", "__rcmp__",
***************
*** 812,817 ****
static int
! instance_compare(inst, other)
! PyObject *inst, *other;
{
PyObject *result;
--- 771,775 ----
static int
! instance_compare(PyObject *inst, PyObject *other)
{
PyObject *result;
***************
*** 836,841 ****
static long
! instance_hash(inst)
! PyInstanceObject *inst;
{
PyObject *func;
--- 794,798 ----
static long
! instance_hash(PyInstanceObject *inst)
{
PyObject *func;
***************
*** 899,904 ****
static int
! instance_length(inst)
! PyInstanceObject *inst;
{
PyObject *func;
--- 856,860 ----
static int
! instance_length(PyInstanceObject *inst)
{
PyObject *func;
***************
*** 931,937 ****
static PyObject *
! instance_subscript(inst, key)
! PyInstanceObject *inst;
! PyObject *key;
{
PyObject *func;
--- 887,891 ----
static PyObject *
! instance_subscript(PyInstanceObject *inst, PyObject *key)
{
PyObject *func;
***************
*** 956,963 ****
static int
! instance_ass_subscript(inst, key, value)
! PyInstanceObject*inst;
! PyObject *key;
! PyObject *value;
{
PyObject *func;
--- 910,914 ----
static int
! instance_ass_subscript(PyInstanceObject *inst, PyObject *key, PyObject *value)
{
PyObject *func;
***************
*** 1001,1007 ****
static PyObject *
! instance_item(inst, i)
! PyInstanceObject *inst;
! int i;
{
PyObject *func, *arg, *res;
--- 952,956 ----
static PyObject *
! instance_item(PyInstanceObject *inst, int i)
{
PyObject *func, *arg, *res;
***************
*** 1024,1030 ****
static PyObject *
! instance_slice(inst, i, j)
! PyInstanceObject *inst;
! int i, j;
{
PyObject *func, *arg, *res;
--- 973,977 ----
static PyObject *
! instance_slice(PyInstanceObject *inst, int i, int j)
{
PyObject *func, *arg, *res;
***************
*** 1048,1055 ****
static int
! instance_ass_item(inst, i, item)
! PyInstanceObject *inst;
! int i;
! PyObject *item;
{
PyObject *func, *arg, *res;
--- 995,999 ----
static int
! instance_ass_item(PyInstanceObject *inst, int i, PyObject *item)
{
PyObject *func, *arg, *res;
***************
*** 1085,1092 ****
static int
! instance_ass_slice(inst, i, j, value)
! PyInstanceObject *inst;
! int i, j;
! PyObject *value;
{
PyObject *func, *arg, *res;
--- 1029,1033 ----
static int
! instance_ass_slice(PyInstanceObject *inst, int i, int j, PyObject *value)
{
PyObject *func, *arg, *res;
***************
*** 1177,1181 ****
}
! static PySequenceMethods instance_as_sequence = {
(inquiry)instance_length, /*sq_length*/
0, /*sq_concat*/
--- 1118,1123 ----
}
! static PySequenceMethods
! instance_as_sequence = {
(inquiry)instance_length, /*sq_length*/
0, /*sq_concat*/
***************
*** 1189,1195 ****
static PyObject *
! generic_unary_op(self, methodname)
! PyInstanceObject *self;
! PyObject *methodname;
{
PyObject *func, *res;
--- 1131,1135 ----
static PyObject *
! generic_unary_op(PyInstanceObject *self, PyObject *methodname)
{
PyObject *func, *res;
***************
*** 1204,1209 ****
/* Forward */
! static int halfbinop(PyObject *, PyObject *, char *, PyObject **,
! PyObject * (*)(PyObject *, PyObject *), int);
--- 1144,1150 ----
/* Forward */
! static int
! halfbinop(PyObject *, PyObject *, char *, PyObject **,
! PyObject * (*)(PyObject *, PyObject *), int);
***************
*** 1211,1220 ****
PyObject *
! PyInstance_DoBinOp(v, w, opname, ropname, thisfunc)
! PyObject *v;
! PyObject *w;
! char *opname;
! char *ropname;
! PyObject * (*thisfunc)(PyObject *, PyObject *);
{
char buf[256];
--- 1152,1157 ----
PyObject *
! PyInstance_DoBinOp(PyObject *v, PyObject *w, char *opname, char *ropname,
! PyObject * (*thisfunc)(PyObject *, PyObject *))
{
char buf[256];
***************
*** 1245,1255 ****
static int
! halfbinop(v, w, opname, r_result, thisfunc, swapped)
! PyObject *v;
! PyObject *w;
! char *opname;
! PyObject **r_result;
! PyObject * (*thisfunc)(PyObject *, PyObject *);
! int swapped;
{
PyObject *func;
--- 1182,1187 ----
static int
! halfbinop(PyObject *v, PyObject *w, char *opname, PyObject **r_result,
! PyObject * (*thisfunc)(PyObject *, PyObject *), int swapped)
{
PyObject *func;
***************
*** 1327,1333 ****
static int
! instance_coerce(pv, pw)
! PyObject **pv;
! PyObject **pw;
{
PyObject *v = *pv;
--- 1259,1263 ----
static int
! instance_coerce(PyObject **pv, PyObject **pw)
{
PyObject *v = *pv;
***************
*** 1396,1401 ****
static int
! instance_nonzero(self)
! PyInstanceObject *self;
{
PyObject *func, *res;
--- 1326,1330 ----
static int
! instance_nonzero(PyInstanceObject *self)
{
PyObject *func, *res;
***************
*** 1445,1452 ****
/* This version is for ternary calls only (z != None) */
static PyObject *
! instance_pow(v, w, z)
! PyObject *v;
! PyObject *w;
! PyObject *z;
{
/* XXX Doesn't do coercions... */
--- 1374,1378 ----
/* This version is for ternary calls only (z != None) */
static PyObject *
! instance_pow(PyObject *v, PyObject *w, PyObject *z)
{
/* XXX Doesn't do coercions... */
***************
*** 1534,1541 ****
PyObject *
! PyMethod_New(func, self, class)
! PyObject *func;
! PyObject *self;
! PyObject *class;
{
register PyMethodObject *im;
--- 1460,1464 ----
PyObject *
! PyMethod_New(PyObject *func, PyObject *self, PyObject *class)
{
register PyMethodObject *im;
***************
*** 1565,1570 ****
PyObject *
! PyMethod_Function(im)
! register PyObject *im;
{
if (!PyMethod_Check(im)) {
--- 1488,1492 ----
PyObject *
! PyMethod_Function(register PyObject *im)
{
if (!PyMethod_Check(im)) {
***************
*** 1576,1581 ****
PyObject *
! PyMethod_Self(im)
! register PyObject *im;
{
if (!PyMethod_Check(im)) {
--- 1498,1502 ----
PyObject *
! PyMethod_Self(register PyObject *im)
{
if (!PyMethod_Check(im)) {
***************
*** 1587,1592 ****
PyObject *
! PyMethod_Class(im)
! register PyObject *im;
{
if (!PyMethod_Check(im)) {
--- 1508,1512 ----
PyObject *
! PyMethod_Class(register PyObject *im)
{
if (!PyMethod_Check(im)) {
***************
*** 1612,1618 ****
static PyObject *
! instancemethod_getattr(im, name)
! register PyMethodObject *im;
! PyObject *name;
{
char *sname = PyString_AsString(name);
--- 1532,1536 ----
static PyObject *
! instancemethod_getattr(register PyMethodObject *im, PyObject *name)
{
char *sname = PyString_AsString(name);
***************
*** 1633,1638 ****
static void
! instancemethod_dealloc(im)
! register PyMethodObject *im;
{
PyObject_GC_Fini(im);
--- 1551,1555 ----
static void
! instancemethod_dealloc(register PyMethodObject *im)
{
PyObject_GC_Fini(im);
***************
*** 1645,1650 ****
static int
! instancemethod_compare(a, b)
! PyMethodObject *a, *b;
{
if (a->im_self != b->im_self)
--- 1562,1566 ----
static int
! instancemethod_compare(PyMethodObject *a, PyMethodObject *b)
{
if (a->im_self != b->im_self)
***************
*** 1654,1659 ****
static PyObject *
! instancemethod_repr(a)
! PyMethodObject *a;
{
char buf[240];
--- 1570,1574 ----
static PyObject *
! instancemethod_repr(PyMethodObject *a)
{
char buf[240];
***************
*** 1697,1702 ****
static long
! instancemethod_hash(a)
! PyMethodObject *a;
{
long x, y;
--- 1612,1616 ----
static long
! instancemethod_hash(PyMethodObject *a)
{
long x, y;
***************
*** 1764,1768 ****
void
! PyMethod_Fini()
{
while (free_list) {
--- 1678,1682 ----
void
! PyMethod_Fini(void)
{
while (free_list) {