[Stackless-checkins] CVS: slpdev/src/2.3/dev/Python bltinmodule.c, 1.7, 1.8 ceval.c, 1.79, 1.80 pystate.c, 1.10, 1.11 pythonrun.c, 1.18, 1.19 traceback.c, 1.9, 1.10

Christian Tismer tismer at centera.de
Sun Apr 25 01:29:42 CEST 2004


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

Modified Files:
	bltinmodule.c ceval.c pystate.c pythonrun.c traceback.c 
Log Message:
I did a big cleanup. Tried to reformat everything using 8-tabs,
roemoved dead code, and tried to make all Python source
file whitespace compatible with the Stackless' version.

I hope I didn't make too many mistakes...

Index: bltinmodule.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Python/bltinmodule.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** bltinmodule.c	5 Apr 2004 17:17:36 -0000	1.7
--- bltinmodule.c	24 Apr 2004 23:29:39 -0000	1.8
***************
*** 2039,2044 ****
   	{"divmod",	builtin_divmod,     METH_VARARGS, divmod_doc},
  #ifdef STACKLESS
!  	{"eval",	builtin_eval,       METH_VARARGS | METH_STACKLESS, eval_doc},
! 	{"execfile",	builtin_execfile,   METH_VARARGS | METH_STACKLESS, execfile_doc},
  #else
   	{"eval",	builtin_eval,       METH_VARARGS, eval_doc},
--- 2039,2046 ----
   	{"divmod",	builtin_divmod,     METH_VARARGS, divmod_doc},
  #ifdef STACKLESS
!  	{"eval",	builtin_eval,       METH_VARARGS | METH_STACKLESS,
! 	 eval_doc},
! 	{"execfile",	builtin_execfile,   METH_VARARGS | METH_STACKLESS,
! 	 execfile_doc},
  #else
   	{"eval",	builtin_eval,       METH_VARARGS, eval_doc},

Index: ceval.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Python/ceval.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** ceval.c	18 Apr 2004 14:07:33 -0000	1.79
--- ceval.c	24 Apr 2004 23:29:39 -0000	1.80
***************
*** 53,57 ****
  #endif
  static int call_trace(Py_tracefunc, PyObject *, PyFrameObject *,
! 			  int, PyObject *);
  static void call_trace_protected(Py_tracefunc, PyObject *,
  				 PyFrameObject *, int);
--- 53,57 ----
  #endif
  static int call_trace(Py_tracefunc, PyObject *, PyFrameObject *,
! 		      int, PyObject *);
  static void call_trace_protected(Py_tracefunc, PyObject *,
[...1194 lines suppressed...]
  			v = PyRun_FileFlags(fp, name, Py_file_input, globals,
! 					    locals, &cf); 
  		else
  			v = PyRun_File(fp, name, Py_file_input, globals,
! 				       locals); 
  	}
  	else {
***************
*** 4357,4361 ****
  		if (PyEval_MergeCompilerFlags(&cf))
  			v = PyRun_StringFlags(str, Py_file_input, globals, 
! 						  locals, &cf);
  		else
  			v = PyRun_String(str, Py_file_input, globals, locals);
--- 4359,4363 ----
  		if (PyEval_MergeCompilerFlags(&cf))
  			v = PyRun_StringFlags(str, Py_file_input, globals, 
! 					      locals, &cf);
  		else
  			v = PyRun_String(str, Py_file_input, globals, locals);

Index: pystate.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Python/pystate.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pystate.c	26 Mar 2004 18:52:38 -0000	1.10
--- pystate.c	24 Apr 2004 23:29:39 -0000	1.11
***************
*** 3,6 ****
--- 3,11 ----
  
  #include "Python.h"
+ #ifdef STACKLESS
+ /* XXX this should vanish! */
+ #include "compile.h"
+ #include "frameobject.h"
+ #endif
  
  #ifdef HAVE_DLOPEN
***************
*** 38,41 ****
--- 43,47 ----
  PyThreadFrameGetter _PyThreadState_GetFrame = NULL;
  
+ 
  PyInterpreterState *
  PyInterpreterState_New(void)
***************
*** 126,131 ****
  #ifdef STACKLESS
  	/* make sure to return a real frame */
! 	PyFrameObject *f = self->frame;
! 	while (f != NULL && ! PyFrame_Check(f))
  		f = f->f_back;
  	return f;
--- 132,137 ----
  #ifdef STACKLESS
  	/* make sure to return a real frame */
! 	struct _frame *f = self->frame;
! 	while (f != NULL && !PyFrame_Check(f))
  		f = f->f_back;
  	return f;
***************
*** 175,178 ****
--- 181,185 ----
  		STACKLESS_PYSTATE_NEW;
  #endif
+ 
  		HEAD_LOCK();
  		tstate->next = interp->tstate_head;
***************
*** 191,196 ****
  	STACKLESS_PYSTATE_ZAP;
  #endif
! 
!     if (Py_VerboseFlag && tstate->frame != NULL)
  		fprintf(stderr,
  		  "PyThreadState_Clear: warning: thread still has a frame\n");
--- 198,202 ----
  	STACKLESS_PYSTATE_ZAP;
  #endif
! 	if (Py_VerboseFlag && tstate->frame != NULL)
  		fprintf(stderr,
  		  "PyThreadState_Clear: warning: thread still has a frame\n");

Index: pythonrun.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Python/pythonrun.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** pythonrun.c	23 Apr 2004 00:34:38 -0000	1.18
--- pythonrun.c	24 Apr 2004 23:29:39 -0000	1.19
***************
*** 331,335 ****
  	call_sys_exitfunc();
  #ifdef STACKLESS
!     PyStackless_kill_tasks_with_stacks();
  #endif
  	initialized = 0;
--- 331,335 ----
  	call_sys_exitfunc();
  #ifdef STACKLESS
! 	PyStackless_kill_tasks_with_stacks();
  #endif
  	initialized = 0;
***************
*** 431,434 ****
--- 431,435 ----
  	PyInt_Fini();
  	PyFloat_Fini();
+ 
  #ifdef Py_USING_UNICODE
  	/* Cleanup Unicode implementation */

Index: traceback.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Python/traceback.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** traceback.c	18 Apr 2004 16:45:25 -0000	1.9
--- traceback.c	24 Apr 2004 23:29:39 -0000	1.10
***************
*** 97,102 ****
  	0,					/* tp_iternext */
  	0,					/* tp_methods */
! 	0,					/* tp_members */
! 	0,					/* tp_getset */
  	0,					/* tp_base */
  	0,					/* tp_dict */
--- 97,102 ----
  	0,					/* tp_iternext */
  	0,					/* tp_methods */
! 	0,			/* tp_members */
! 	0,			/* tp_getset */
  	0,					/* tp_base */
  	0,					/* tp_dict */


_______________________________________________
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