[Python-checkins] CVS: python/dist/src/Modules operator.c,2.13,2.14

Fri, 7 Jul 2000 21:12:11 -0700

Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv5553
Modified Files:
	operator.c 
Log Message:
ANSI-fy the sources.
Index: operator.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/operator.c,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -r2.13 -r2.14
*** operator.c	1998年12月04日 18:49:56	2.13
--- operator.c	2000年07月08日 04:12:08	2.14
***************
*** 70,89 ****
 #include "Python.h"
 
! #define spam1(OP,AOP) static PyObject *OP(s,a) PyObject *s, *a; { \
 PyObject *a1; \
 if(! PyArg_ParseTuple(a,"O",&a1)) return NULL; \
 return AOP(a1); }
 
! #define spam2(OP,AOP) static PyObject *OP(s,a) PyObject *s, *a; { \
 PyObject *a1, *a2; \
 if(! PyArg_ParseTuple(a,"OO",&a1,&a2)) return NULL; \
 return AOP(a1,a2); }
 
! #define spamoi(OP,AOP) static PyObject *OP(s,a) PyObject *s, *a; { \
 PyObject *a1; int a2; \
 if(! PyArg_ParseTuple(a,"Oi",&a1,&a2)) return NULL; \
 return AOP(a1,a2); }
 
! #define spam2n(OP,AOP) static PyObject *OP(s,a) PyObject *s, *a; { \
 PyObject *a1, *a2; \
 if(! PyArg_ParseTuple(a,"OO",&a1,&a2)) return NULL; \
--- 70,89 ----
 #include "Python.h"
 
! #define spam1(OP,AOP) static PyObject *OP(PyObject *s, PyObject *a) { \
 PyObject *a1; \
 if(! PyArg_ParseTuple(a,"O",&a1)) return NULL; \
 return AOP(a1); }
 
! #define spam2(OP,AOP) static PyObject *OP(PyObject *s, PyObject *a) { \
 PyObject *a1, *a2; \
 if(! PyArg_ParseTuple(a,"OO",&a1,&a2)) return NULL; \
 return AOP(a1,a2); }
 
! #define spamoi(OP,AOP) static PyObject *OP(PyObject *s, PyObject *a) { \
 PyObject *a1; int a2; \
 if(! PyArg_ParseTuple(a,"Oi",&a1,&a2)) return NULL; \
 return AOP(a1,a2); }
 
! #define spam2n(OP,AOP) static PyObject *OP(PyObject *s, PyObject *a) { \
 PyObject *a1, *a2; \
 if(! PyArg_ParseTuple(a,"OO",&a1,&a2)) return NULL; \
***************
*** 92,96 ****
 return Py_None; }
 
! #define spam3n(OP,AOP) static PyObject *OP(s,a) PyObject *s, *a; { \
 PyObject *a1, *a2, *a3; \
 if(! PyArg_ParseTuple(a,"OOO",&a1,&a2,&a3)) return NULL; \
--- 92,96 ----
 return Py_None; }
 
! #define spam3n(OP,AOP) static PyObject *OP(PyObject *s, PyObject *a) { \
 PyObject *a1, *a2, *a3; \
 if(! PyArg_ParseTuple(a,"OOO",&a1,&a2,&a3)) return NULL; \
***************
*** 99,103 ****
 return Py_None; }
 
! #define spami(OP,AOP) static PyObject *OP(s,a) PyObject *s, *a; { \
 PyObject *a1; long r; \
 if(! PyArg_ParseTuple(a,"O",&a1)) return NULL; \
--- 99,103 ----
 return Py_None; }
 
! #define spami(OP,AOP) static PyObject *OP(PyObject *s, PyObject *a) { \
 PyObject *a1; long r; \
 if(! PyArg_ParseTuple(a,"O",&a1)) return NULL; \
***************
*** 105,109 ****
 return PyInt_FromLong(r); }
 
! #define spami2(OP,AOP) static PyObject *OP(s,a) PyObject *s, *a; { \
 PyObject *a1, *a2; long r; \
 if(! PyArg_ParseTuple(a,"OO",&a1,&a2)) return NULL; \
--- 105,109 ----
 return PyInt_FromLong(r); }
 
! #define spami2(OP,AOP) static PyObject *OP(PyObject *s, PyObject *a) { \
 PyObject *a1, *a2; long r; \
 if(! PyArg_ParseTuple(a,"OO",&a1,&a2)) return NULL; \
***************
*** 141,146 ****
 
 static PyObject*
! op_getslice(s,a)
! PyObject *s, *a;
 {
 PyObject *a1;
--- 141,145 ----
 
 static PyObject*
! op_getslice(PyObject *s, PyObject *a)
 {
 PyObject *a1;
***************
*** 153,158 ****
 
 static PyObject*
! op_setslice(s,a)
! PyObject *s, *a;
 {
 PyObject *a1, *a4;
--- 152,156 ----
 
 static PyObject*
! op_setslice(PyObject *s, PyObject *a)
 {
 PyObject *a1, *a4;
***************
*** 170,175 ****
 
 static PyObject*
! op_delslice(s,a)
! PyObject *s, *a;
 {
 PyObject *a1;
--- 168,172 ----
 
 static PyObject*
! op_delslice(PyObject *s, PyObject *a)
 {
 PyObject *a1;
***************
*** 189,199 ****
 #undef spam2
 #ifdef HAVE_OLD_CPP
! #define spam1(OP,DOC) {"OP", OP, 1, DOC},
! #define spam2(OP,ALTOP,DOC) {"OP", op_/**/OP, 1, DOC}, \
! 			 {"ALTOP", op_/**/OP, 1, DOC}, 
 #else
! #define spam1(OP,DOC) {#OP, OP, 1, DOC},
! #define spam2(OP,ALTOP,DOC) {#OP, op_##OP, 1, DOC}, \
! 			 {#ALTOP, op_##OP, 1, DOC}, 
 #endif
 
--- 186,196 ----
 #undef spam2
 #ifdef HAVE_OLD_CPP
! #define spam1(OP,DOC) {"OP", OP, METH_VARARGS, DOC},
! #define spam2(OP,ALTOP,DOC) {"OP", op_/**/OP, METH_VARARGS, DOC}, \
! 			 {"ALTOP", op_/**/OP, METH_VARARGS, DOC}, 
 #else
! #define spam1(OP,DOC) {#OP, OP, METH_VARARGS, DOC},
! #define spam2(OP,ALTOP,DOC) {#OP, op_##OP, METH_VARARGS, DOC}, \
! 			 {#ALTOP, op_##OP, METH_VARARGS, DOC}, 
 #endif