[Python-checkins] CVS: python/dist/src/Python ceval.c,2.256,2.257

2001年6月26日 13:59:00 -0700

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv12198/python/dist/src/Python
Modified Files:
	ceval.c 
Log Message:
Add "gi_" (generator-iterator) prefix to names of genobject members.
Makes it much easier to find references via dumb editor search (former
"frame" in particular was near-hopeless).
Index: ceval.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v
retrieving revision 2.256
retrieving revision 2.257
diff -C2 -r2.256 -r2.257
*** ceval.c	2001年06月23日 06:19:16	2.256
--- ceval.c	2001年06月26日 20:58:58	2.257
***************
*** 112,117 ****
 typedef struct {
 	PyObject_HEAD
! 	PyFrameObject *frame;
! int running; /* true if generator is being executed */ 
 } genobject;

--- 112,121 ----
 typedef struct {
 	PyObject_HEAD
! 	/* The gi_ prefix is intended to remind of generator-iterator. */
! 
! 	PyFrameObject *gi_frame;
! 
! /* True if generator is being executed. */ 
! int gi_running;
 } genobject;

***************
*** 124,129 ****
 		return NULL;
 	}
! 	gen->frame = f;
! 	gen->running = 0;
 	return (PyObject *)gen;
 }
--- 128,133 ----
 		return NULL;
 	}
! 	gen->gi_frame = f;
! 	gen->gi_running = 0;
 	return (PyObject *)gen;
 }
***************
*** 132,136 ****
 gen_dealloc(genobject *gen)
 {
! 	Py_DECREF(gen->frame);
 	PyObject_DEL(gen);
 }
--- 136,140 ----
 gen_dealloc(genobject *gen)
 {
! 	Py_DECREF(gen->gi_frame);
 	PyObject_DEL(gen);
 }
***************
*** 140,147 ****
 {
 	PyThreadState *tstate = PyThreadState_GET();
! 	PyFrameObject *f = gen->frame;
 	PyObject *result;

! 	if (gen->running) {
 		PyErr_SetString(PyExc_ValueError,
 				"generator already executing");
--- 144,151 ----
 {
 	PyThreadState *tstate = PyThreadState_GET();
! 	PyFrameObject *f = gen->gi_frame;
 	PyObject *result;

! 	if (gen->gi_running) {
 		PyErr_SetString(PyExc_ValueError,
 				"generator already executing");
***************
*** 157,163 ****
 	f->f_back = tstate->frame;

! 	gen->running = 1;
 	result = eval_frame(f);
! 	gen->running = 0;

 	/* Don't keep the reference to f_back any longer than necessary. It
--- 161,167 ----
 	f->f_back = tstate->frame;

! 	gen->gi_running = 1;
 	result = eval_frame(f);
! 	gen->gi_running = 0;

 	/* Don't keep the reference to f_back any longer than necessary. It