[Python-checkins] python/dist/src/Python ceval.c,2.406,2.407

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14461/Python

Modified Files:
	ceval.c 
Log Message:
Patch #966493: Cleanup generator/eval_frame exposure.


Index: ceval.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v
retrieving revision 2.406
retrieving revision 2.407
diff -C2 -d -r2.406 -r2.407
*** ceval.c	26 Jun 2004 04:34:33 -0000	2.406
--- ceval.c	27 Jun 2004 15:43:12 -0000	2.407
***************
*** 11,15 ****
  #include "compile.h"
  #include "frameobject.h"
- #include "genobject.h"
  #include "eval.h"
  #include "opcode.h"
--- 11,14 ----
***************
*** 50,54 ****
  
  /* Forward declarations */
- static PyObject *eval_frame(PyFrameObject *);
  #ifdef WITH_TSC
  static PyObject *call_function(PyObject ***, int, uint64*, uint64*);
--- 49,52 ----
***************
*** 459,464 ****
  /* Interpreter main loop */
  
! static PyObject *
! eval_frame(PyFrameObject *f)
  {
  #ifdef DXPAIRS
--- 457,462 ----
  /* Interpreter main loop */
  
! PyObject *
! PyEval_EvalFrame(PyFrameObject *f)
  {
  #ifdef DXPAIRS
***************
*** 2456,2461 ****
  
  /* this is gonna seem *real weird*, but if you put some other code between
!    eval_frame() and PyEval_EvalCodeEx() you will need to adjust the test in
!    the if statement in Misc/gdbinit:ppystack */
  
  PyObject *
--- 2454,2459 ----
  
  /* this is gonna seem *real weird*, but if you put some other code between
!    PyEval_EvalFrame() and PyEval_EvalCodeEx() you will need to adjust
! 	the test in the if statement in Misc/gdbinit:ppystack */
  
  PyObject *
***************
*** 2685,2689 ****
  	}
  
!         retval = eval_frame(f);
  
    fail: /* Jump here from prelude on failure */
--- 2683,2687 ----
  	}
  
!         retval = PyEval_EvalFrame(f);
  
    fail: /* Jump here from prelude on failure */
***************
*** 3416,3425 ****
  }
  
- PyObject *
- PyEval_EvaluateFrame(PyObject *fo)
- {
- 	return eval_frame((PyFrameObject *)fo);
- }
- 
  #define EXT_POP(STACK_POINTER) (*--(STACK_POINTER))
  
--- 3414,3417 ----
***************
*** 3598,3602 ****
  			fastlocals[i] = *stack++;
  		}
! 		retval = eval_frame(f);
  		assert(tstate != NULL);
  		++tstate->recursion_depth;
--- 3590,3594 ----
  			fastlocals[i] = *stack++;
  		}
! 		retval = PyEval_EvalFrame(f);
  		assert(tstate != NULL);
  		++tstate->recursion_depth;