traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Whitespace normalization 

- In functions where we already hold the same object in differently typed
   pointers, use the correctly typed pointer instead of casting the other
   pointer a second time.
This commit is contained in:
Thomas Wouters 2006-04-15 21:41:56 +00:00
parent 112d4ec7d5
commit 447d095976
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Objects/genobject.c
View File

@ -22,12 +22,11 @@ gen_dealloc(PyGenObject *gen)
_PyObject_GC_UNTRACK(gen); _PyObject_GC_UNTRACK(gen);
if (gen->gi_weakreflist != NULL) if (gen->gi_weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *) gen); PyObject_ClearWeakRefs(self);
_PyObject_GC_TRACK(self); _PyObject_GC_TRACK(self);
if (gen->gi_frame!=NULL && gen->gi_frame->f_stacktop!=NULL) { if (gen->gi_frame != NULL && gen->gi_frame->f_stacktop != NULL) {
/* Generator is paused, so we need to close */ /* Generator is paused, so we need to close */
gen->ob_type->tp_del(self); gen->ob_type->tp_del(self);
if (self->ob_refcnt > 0) if (self->ob_refcnt > 0)
@ -54,14 +53,16 @@ gen_send_ex(PyGenObject *gen, PyObject *arg, int exc)
} }
if (f==NULL || f->f_stacktop == NULL) { if (f==NULL || f->f_stacktop == NULL) {
/* Only set exception if called from send() */ /* Only set exception if called from send() */
if (arg && !exc) PyErr_SetNone(PyExc_StopIteration); if (arg && !exc)
PyErr_SetNone(PyExc_StopIteration);
return NULL; return NULL;
} }
if (f->f_lasti == -1) { if (f->f_lasti == -1) {
if (arg && arg != Py_None) { if (arg && arg != Py_None) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"can't send non-None value to a just-started generator"); "can't send non-None value to a "
"just-started generator");
return NULL; return NULL;
} }
} else { } else {
@ -93,7 +94,8 @@ gen_send_ex(PyGenObject *gen, PyObject *arg, int exc)
Py_DECREF(result); Py_DECREF(result);
result = NULL; result = NULL;
/* Set exception if not called by gen_iternext() */ /* Set exception if not called by gen_iternext() */
if (arg) PyErr_SetNone(PyExc_StopIteration); if (arg)
PyErr_SetNone(PyExc_StopIteration);
} }
if (!result || f->f_stacktop == NULL) { if (!result || f->f_stacktop == NULL) {
@ -127,11 +129,11 @@ gen_close(PyGenObject *gen, PyObject *args)
if (retval) { if (retval) {
Py_DECREF(retval); Py_DECREF(retval);
PyErr_SetString(PyExc_RuntimeError, PyErr_SetString(PyExc_RuntimeError,
"generator ignored GeneratorExit"); "generator ignored GeneratorExit");
return NULL; return NULL;
} }
if ( PyErr_ExceptionMatches(PyExc_StopIteration) if (PyErr_ExceptionMatches(PyExc_StopIteration)
|| PyErr_ExceptionMatches(PyExc_GeneratorExit) ) || PyErr_ExceptionMatches(PyExc_GeneratorExit))
{ {
PyErr_Clear(); /* ignore these errors */ PyErr_Clear(); /* ignore these errors */
Py_INCREF(Py_None); Py_INCREF(Py_None);
@ -147,7 +149,7 @@ gen_del(PyObject *self)
PyObject *error_type, *error_value, *error_traceback; PyObject *error_type, *error_value, *error_traceback;
PyGenObject *gen = (PyGenObject *)self; PyGenObject *gen = (PyGenObject *)self;
if (!gen->gi_frame || gen->gi_frame->f_stacktop==NULL) if (gen->gi_frame == NULL || gen->gi_frame->f_stacktop == NULL)
/* Generator isn't paused, so no need to close */ /* Generator isn't paused, so no need to close */
return; return;
@ -158,10 +160,10 @@ gen_del(PyObject *self)
/* Save the current exception, if any. */ /* Save the current exception, if any. */
PyErr_Fetch(&error_type, &error_value, &error_traceback); PyErr_Fetch(&error_type, &error_value, &error_traceback);
res = gen_close((PyGenObject *)self, NULL); res = gen_close(gen, NULL);
if (res == NULL) if (res == NULL)
PyErr_WriteUnraisable((PyObject *)self); PyErr_WriteUnraisable(self);
else else
Py_DECREF(res); Py_DECREF(res);