[Stackless-checkins] CVS: slpdev/src/2.3/dev/Objects abstract.c, 1.9, 1.10 classobject.c, 1.13, 1.14 descrobject.c, 1.8, 1.9 funcobject.c, 1.7, 1.8 typeobject.c, 1.11, 1.12
Christian Tismer
tismer at centera.de
Mon Apr 5 19:17:38 CEST 2004
Update of /home/cvs/slpdev/src/2.3/dev/Objects
In directory centera.de:/tmp/cvs-serv17563/Objects
Modified Files:
abstract.c classobject.c descrobject.c funcobject.c
typeobject.c
Log Message:
removed certain #ifdefs, which unfortunatly became necessary
after the STACKLESS_GETARG was moved to the top of every
function. I chnaged the definition for the not STACKLESS case
to a typedef, which is probably ignored and doesn't give warnings.
Index: abstract.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Objects/abstract.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** abstract.c 5 Apr 2004 14:47:13 -0000 1.9
--- abstract.c 5 Apr 2004 17:17:36 -0000 1.10
***************
*** 1751,1765 ****
PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw)
{
- #ifdef STACKLESS
STACKLESS_GETARG();
- #endif
ternaryfunc call;
if ((call = func->ob_type->tp_call) != NULL) {
- #ifdef STACKLESS
PyObject *result = (STACKLESS_PROMOTE(func), (*call)(func, arg, kw));
- #else
- PyObject *result = (*call)(func, arg, kw);
- #endif
if (result == NULL && !PyErr_Occurred())
PyErr_SetString(
--- 1751,1759 ----
***************
*** 1776,1782 ****
PyObject_CallFunction(PyObject *callable, char *format, ...)
{
- #ifdef STACKLESS
STACKLESS_GETARG();
- #endif
va_list va;
PyObject *args, *retval;
--- 1770,1774 ----
***************
*** 1806,1816 ****
args = a;
}
- #ifdef STACKLESS
STACKLESS_PROMOTE_ALL();
- #endif
retval = PyObject_Call(callable, args, NULL);
- #ifdef STACKLESS
STACKLESS_ASSERT();
- #endif
Py_DECREF(args);
--- 1798,1804 ----
***************
*** 1821,1827 ****
PyObject_CallMethod(PyObject *o, char *name, char *format, ...)
{
- #ifdef STACKLESS
STACKLESS_GETARG();
- #endif
va_list va;
PyObject *args, *func = 0, *retval;
--- 1809,1813 ----
***************
*** 1860,1870 ****
args = a;
}
- #ifdef STACKLESS
STACKLESS_PROMOTE_ALL();
- #endif
retval = PyObject_Call(func, args, NULL);
- #ifdef STACKLESS
STACKLESS_ASSERT();
- #endif
Py_DECREF(args);
Py_DECREF(func);
--- 1846,1852 ----
***************
*** 1907,1913 ****
PyObject_CallMethodObjArgs(PyObject *callable, PyObject *name, ...)
{
- #ifdef STACKLESS
STACKLESS_GETARG();
- #endif
PyObject *args, *tmp;
va_list vargs;
--- 1889,1893 ----
***************
*** 1928,1938 ****
return NULL;
}
- #ifdef STACKLESS
STACKLESS_PROMOTE_ALL();
- #endif
tmp = PyObject_Call(callable, args, NULL);
- #ifdef STACKLESS
STACKLESS_ASSERT();
- #endif
Py_DECREF(args);
Py_DECREF(callable);
--- 1908,1914 ----
***************
*** 1944,1950 ****
PyObject_CallFunctionObjArgs(PyObject *callable, ...)
{
- #ifdef STACKLESS
STACKLESS_GETARG();
- #endif
PyObject *args, *tmp;
va_list vargs;
--- 1920,1924 ----
***************
*** 1959,1969 ****
if (args == NULL)
return NULL;
- #ifdef STACKLESS
STACKLESS_PROMOTE_ALL();
- #endif
tmp = PyObject_Call(callable, args, NULL);
- #ifdef STACKLESS
STACKLESS_ASSERT();
- #endif
Py_DECREF(args);
--- 1933,1939 ----
***************
*** 2223,2240 ****
PyIter_Next(PyObject *iter)
{
- #ifdef STACKLESS
STACKLESS_GETARG();
- #endif
PyObject *result;
assert(PyIter_Check(iter));
#ifdef STACKLESS
/* we use the same flag here, since iterators are not callable */
-
- STACKLESS_PROMOTE(iter);
#endif
result = (*iter->ob_type->tp_iternext)(iter);
- #ifdef STACKLESS
STACKLESS_ASSERT();
- #endif
if (result == NULL &&
PyErr_Occurred() &&
--- 2193,2205 ----
PyIter_Next(PyObject *iter)
{
STACKLESS_GETARG();
PyObject *result;
assert(PyIter_Check(iter));
#ifdef STACKLESS
/* we use the same flag here, since iterators are not callable */
#endif
+ STACKLESS_PROMOTE(iter);
result = (*iter->ob_type->tp_iternext)(iter);
STACKLESS_ASSERT();
if (result == NULL &&
PyErr_Occurred() &&
Index: classobject.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Objects/classobject.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** classobject.c 5 Apr 2004 14:47:13 -0000 1.13
--- classobject.c 5 Apr 2004 17:17:36 -0000 1.14
***************
*** 2352,2360 ****
}
- #ifdef STACKLESS
- void
- #else
static void
- #endif
getclassname(PyObject *class, char *buf, int bufsize)
{
--- 2352,2356 ----
***************
*** 2378,2386 ****
}
- #ifdef STACKLESS
- void
- #else
static void
- #endif
getinstclassname(PyObject *inst, char *buf, int bufsize)
{
--- 2374,2378 ----
***************
*** 2407,2413 ****
instancemethod_call(PyObject *func, PyObject *arg, PyObject *kw)
{
- #ifdef STACKLESS
STACKLESS_GETARG();
- #endif
PyObject *self = PyMethod_GET_SELF(func);
PyObject *class = PyMethod_GET_CLASS(func);
--- 2399,2403 ----
Index: descrobject.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Objects/descrobject.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** descrobject.c 5 Apr 2004 14:47:13 -0000 1.8
--- descrobject.c 5 Apr 2004 17:17:36 -0000 1.9
***************
*** 211,217 ****
methoddescr_call(PyMethodDescrObject *descr, PyObject *args, PyObject *kwds)
{
- #ifdef STACKLESS
STACKLESS_GETARG();
- #endif
int argc;
PyObject *self, *func, *result;
--- 211,215 ----
***************
*** 260,266 ****
PyObject *kwds)
{
- #ifdef STACKLESS
STACKLESS_GETARG();
- #endif
PyObject *func, *result;
--- 258,262 ----
***************
*** 269,279 ****
return NULL;
- #ifdef STACKLESS
STACKLESS_PROMOTE_ALL();
- #endif
result = PyEval_CallObjectWithKeywords(func, args, kwds);
- #ifdef STACKLESS
STACKLESS_ASSERT();
- #endif
Py_DECREF(func);
return result;
--- 265,271 ----
***************
*** 283,289 ****
wrapperdescr_call(PyWrapperDescrObject *descr, PyObject *args, PyObject *kwds)
{
- #ifdef STACKLESS
STACKLESS_GETARG();
- #endif
int argc;
PyObject *self, *func, *result;
--- 275,279 ----
***************
*** 320,330 ****
return NULL;
}
- #ifdef STACKLESS
STACKLESS_PROMOTE_ALL();
- #endif
result = PyEval_CallObjectWithKeywords(func, args, kwds);
- #ifdef STACKLESS
STACKLESS_ASSERT();
- #endif
Py_DECREF(args);
Py_DECREF(func);
--- 310,316 ----
Index: funcobject.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Objects/funcobject.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** funcobject.c 5 Apr 2004 14:47:13 -0000 1.7
--- funcobject.c 5 Apr 2004 17:17:36 -0000 1.8
***************
*** 469,475 ****
function_call(PyObject *func, PyObject *arg, PyObject *kw)
{
- #ifdef STACKLESS
STACKLESS_GETARG();
- #endif
PyObject *result;
PyObject *argdefs;
--- 469,473 ----
***************
*** 505,511 ****
nk = 0;
}
- #ifdef STACKLESS
STACKLESS_PROMOTE_ALL();
- #endif
result = PyEval_EvalCodeEx(
(PyCodeObject *)PyFunction_GET_CODE(func),
--- 503,507 ----
***************
*** 515,521 ****
PyFunction_GET_CLOSURE(func));
- #ifdef STACKLESS
STACKLESS_ASSERT();
- #endif
if (k != NULL)
PyMem_DEL(k);
--- 511,515 ----
Index: typeobject.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Objects/typeobject.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** typeobject.c 5 Apr 2004 14:47:13 -0000 1.11
--- typeobject.c 5 Apr 2004 17:17:36 -0000 1.12
***************
*** 895,901 ****
call_method(PyObject *o, char *name, PyObject **nameobj, char *format, ...)
{
- #ifdef STACKLESS
STACKLESS_GETARG();
- #endif
va_list va;
PyObject *args, *func = 0, *retval;
--- 895,899 ----
***************
*** 921,931 ****
assert(PyTuple_Check(args));
- #ifdef STACKLESS
STACKLESS_PROMOTE_ALL();
- #endif
retval = PyObject_Call(func, args, NULL);
- #ifdef STACKLESS
STACKLESS_ASSERT();
- #endif
Py_DECREF(args);
Py_DECREF(func);
--- 919,925 ----
***************
*** 939,945 ****
call_maybe(PyObject *o, char *name, PyObject **nameobj, char *format, ...)
{
- #ifdef STACKLESS
STACKLESS_GETARG();
- #endif
va_list va;
PyObject *args, *func = 0, *retval;
--- 933,937 ----
***************
*** 967,977 ****
assert(PyTuple_Check(args));
- #ifdef STACKLESS
STACKLESS_PROMOTE_ALL();
- #endif
retval = PyObject_Call(func, args, NULL);
- #ifdef STACKLESS
STACKLESS_ASSERT();
- #endif
Py_DECREF(args);
Py_DECREF(func);
--- 959,965 ----
_______________________________________________
Stackless-checkins mailing list
Stackless-checkins at stackless.com
http://www.stackless.com/mailman/listinfo/stackless-checkins
More information about the Stackless-checkins
mailing list