[Stackless-checkins] CVS: slpdev/src/2.3/dev/Stackless/core stackless_impl.h, 1.84, 1.85 stacklesseval.c, 1.144, 1.145

Christian Tismer tismer at centera.de
Sat May 1 21:01:08 CEST 2004


Update of /home/cvs/slpdev/src/2.3/dev/Stackless/core
In directory centera.de:/tmp/cvs-serv25121/core

Modified Files:
	stackless_impl.h stacklesseval.c 
Log Message:
made generator patch smaller, for easier re-use
in the older version.

Index: stackless_impl.h
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Stackless/core/stackless_impl.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** stackless_impl.h	29 Apr 2004 17:58:59 -0000	1.84
--- stackless_impl.h	1 May 2004 19:01:06 -0000	1.85
***************
*** 124,127 ****
--- 124,128 ----
  PyAPI_DATA(PyTypeObject) PyGenerator_Type;
  PyAPI_FUNC(PyObject *) PyGenerator_New(struct _frame *f);
+ PyAPI_FUNC(PyObject *) slp_gen_iternext(PyObject *gen);
  #define PyGenerator_Check(op) PyObject_TypeCheck(op, &PyGenerator_Type)
  

Index: stacklesseval.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Stackless/core/stacklesseval.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** stacklesseval.c	29 Apr 2004 17:58:59 -0000	1.144
--- stacklesseval.c	1 May 2004 19:01:06 -0000	1.145
***************
*** 397,413 ****
  DEF_INVALID_EXEC(gen_iternext_callback)
  
! PyObject *
! PyGenerator_New(PyFrameObject *f)
  {
  	static int initialized = 0;
- 	genobject *gen = PyObject_GC_New(genobject, &PyGenerator_Type);
- 	if (gen == NULL) {
- 		Py_DECREF(f);
- 		return NULL;
- 	}
- 	gen->gi_frame = f;
- 	gen->gi_running = 0;
- 	gen->gi_weakreflist = NULL;
- 	_PyObject_GC_TRACK(gen);
  
  	f->f_back = (PyFrameObject *)
--- 397,404 ----
  DEF_INVALID_EXEC(gen_iternext_callback)
  
! static int
! setup_iternext(PyFrameObject *f)
  {
  	static int initialized = 0;
  
  	f->f_back = (PyFrameObject *)
***************
*** 415,420 ****
  				      GEN_CALLBACK_FRAME_SIZE);
  	if (f->f_back == NULL) {
! 		Py_DECREF(gen);
! 		return NULL;
  	}
  	/* initialize pickling of running generators */
--- 406,410 ----
  				      GEN_CALLBACK_FRAME_SIZE);
  	if (f->f_back == NULL) {
! 		return -1;
  	}
  	/* initialize pickling of running generators */
***************
*** 425,456 ****
  			    REF_INVALID_EXEC(gen_iternext_callback)) ) {
  			/* ignore reference, this is a very bad error */
! 			return NULL;
  		}
  		initialized = 1;
  	}
  
! 	return (PyObject *)gen;
! }
! 
! static int
! gen_traverse(genobject *gen, visitproc visit, void *arg)
! {
! 	return visit((PyObject *)gen->gi_frame, arg);
! }
! 
! static void
! gen_dealloc(genobject *gen)
! {
! 	_PyObject_GC_UNTRACK(gen);
! 	if (gen->gi_weakreflist != NULL)
! 		PyObject_ClearWeakRefs((PyObject *) gen);
! 	Py_DECREF(gen->gi_frame);
! 	PyObject_GC_Del(gen);
  }
  
! static PyObject *
! gen_iternext(genobject *gen)
  {
  	STACKLESS_GETARG();
  	PyThreadState *ts = PyThreadState_GET();
  	PyFrameObject *f = gen->gi_frame;
--- 415,431 ----
  			    REF_INVALID_EXEC(gen_iternext_callback)) ) {
  			/* ignore reference, this is a very bad error */
! 			return -1;
  		}
  		initialized = 1;
  	}
  
! 	return 0;
  }
  
! PyObject *
! slp_gen_iternext(PyObject *ob)
  {
  	STACKLESS_GETARG();
+ 	genobject *gen = (genobject *) ob;
  	PyThreadState *ts = PyThreadState_GET();
  	PyFrameObject *f = gen->gi_frame;
***************
*** 466,469 ****
--- 441,446 ----
  		return NULL;
  
+ 	if (f->f_back == NULL && setup_iternext(f))
+ 		return NULL;
  	/* Generators always return to their most recent caller, not
  	 * necessarily their creator. */
***************
*** 527,583 ****
  }
  
- static PyObject *
- gen_getiter(PyObject *gen)
- {
- 	Py_INCREF(gen);
- 	return gen;
- }
- 
- 
- static PyMemberDef gen_memberlist[] = {
- 	{"gi_frame",	T_OBJECT, offsetof(genobject, gi_frame),	RO},
- 	{"gi_running",	T_INT,	  offsetof(genobject, gi_running),	RO},
- 	{NULL}	/* Sentinel */
- };
- 
- 
- PyTypeObject PyGenerator_Type = {
- 	PyObject_HEAD_INIT(&PyType_Type)
- 	0,				/* ob_size */
- 	"generator",			/* tp_name */
- 	sizeof(genobject),		/* tp_basicsize */
- 	0,				/* tp_itemsize */
- 	/* methods */
- 	(destructor)gen_dealloc,	/* tp_dealloc */
- 	0,				/* tp_print */
- 	0,				/* tp_getattr */
- 	0,				/* tp_setattr */
- 	0,				/* tp_compare */
- 	0,				/* tp_repr */
- 	0,				/* tp_as_number */
- 	0,				/* tp_as_sequence */
- 	0,				/* tp_as_mapping */
- 	0,				/* tp_hash */
- 	0,				/* tp_call */
- 	0,				/* tp_str */
- 	PyObject_GenericGetAttr,	/* tp_getattro */
- 	0,				/* tp_setattro */
- 	0,				/* tp_as_buffer */
- 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
- 		Py_TPFLAGS_HAVE_STACKLESS_CALL, /* tp_flags */
-  	0,				/* tp_doc */
-  	(traverseproc)gen_traverse,	/* tp_traverse */
-  	0,				/* tp_clear */
- 	0,				/* tp_richcompare */
- 	offsetof(genobject, gi_weakreflist), /* tp_weaklistoffset */
- 	(getiterfunc)gen_getiter,	/* tp_iter */
- 	(iternextfunc)gen_iternext,	/* tp_iternext */
- 	0,				/* tp_methods */
- 	gen_memberlist,			/* tp_members */
- 	0,				/* tp_getset */
- 	0,				/* tp_base */
- 	0,				/* tp_dict */
- };
- 
  
  /******************************************************
--- 504,507 ----
***************
*** 587,591 ****
  *******************************************************/
  
- 
  static PyObject *
  unwind_repr(PyObject *op)
--- 511,514 ----


_______________________________________________
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