[Stackless-checkins] CVS: slpdev/src/2.3/dev/Python ceval.c, 1.83, 1.84

[Christian Tismer]

Update of /home/cvs/slpdev/src/2.3/dev/Python
In directory centera.de:/tmp/cvs-serv27626/Python

Modified Files:
	ceval.c 
Log Message:
keeping more of the generators in the core file,
and adjusting a few PEP7 things

Index: ceval.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Python/ceval.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** ceval.c	30 Apr 2004 20:51:22 -0000	1.83
--- ceval.c	1 May 2004 20:26:25 -0000	1.84
***************
*** 150,160 ****
  
  #ifdef STACKLESS
! 
! /* the whole generator implementation is moved to stacklesseval.c */
! #define gen_new(arg) PyGenerator_New((arg))
! 
  #else
- 
  static PyTypeObject gentype;
  
  typedef struct {
--- 150,158 ----
  
  #ifdef STACKLESS
! PyTypeObject PyGenerator_Type;
! #define gentype PyGenerator_Type
  #else
  static PyTypeObject gentype;
+ #endif
  
  typedef struct {
***************
*** 171,176 ****
--- 169,180 ----
  } genobject;
  
+ #ifdef STACKLESS
+ PyObject *
+ PyGenerator_New(PyFrameObject *f)
+ #define gen_new PyGenerator_New
+ #else
  static PyObject *
  gen_new(PyFrameObject *f)
+ #endif
  {
  	genobject *gen = PyObject_GC_New(genobject, &gentype);
***************
*** 202,205 ****
--- 206,211 ----
  }
  
+ #ifndef STACKLESS
+ 
  static PyObject *
  gen_iternext(genobject *gen)
***************
*** 243,246 ****
--- 249,254 ----
  }
  
+ #endif
+ 
  static PyObject *
  gen_getiter(PyObject *gen)
***************
*** 256,260 ****
--- 264,272 ----
  };
  
+ #ifdef STACKLESS
+ PyTypeObject PyGenerator_Type = {
+ #else
  static PyTypeObject gentype = {
+ #endif
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,					/* ob_size */
***************
*** 285,289 ****
--- 297,305 ----
  	offsetof(genobject, gi_weakreflist),	/* tp_weaklistoffset */
  	(getiterfunc)gen_getiter,		/* tp_iter */
+ #ifdef STACKLESS
+ 	(iternextfunc)slp_gen_iternext,		/* tp_iternext */
+ #else
  	(iternextfunc)gen_iternext,		/* tp_iternext */
+ #endif
  	0,					/* tp_methods */
  	gen_memberlist,				/* tp_members */
***************
*** 293,298 ****
  };
  
- #endif /* not STACKLESS */
- 
  #ifdef WITH_THREAD
  
--- 309,312 ----
***************
*** 2903,2916 ****
  	retval = Py_None;
  	if (stackless) {
! 	    tstate->frame = f;
  		return STACKLESS_PACK(retval);
  	}
  	else {
!         if (f->f_back != NULL)
!             /* use the faster path */
!             retval = slp_frame_dispatch(f, f->f_back, retval);
!         else {
  			Py_DECREF(retval);
!             retval = slp_eval_frame(f);
  		}
  		return retval;
--- 2917,2930 ----
  	retval = Py_None;
  	if (stackless) {
! 		tstate->frame = f;
  		return STACKLESS_PACK(retval);
  	}
  	else {
! 		if (f->f_back != NULL)
! 			/* use the faster path */
! 			retval = slp_frame_dispatch(f, f->f_back, retval);
!         	else {
  			Py_DECREF(retval);
! 			retval = slp_eval_frame(f);
  		}
  		return retval;


_______________________________________________
Stackless-checkins mailing list
Stackless-checkins at stackless.com
http://www.stackless.com/mailman/listinfo/stackless-checkins