[Stackless-checkins] CVS: slpdev/src/2.2/src/Python ceval.c, 1.66, 1.67

[Christian Tismer]

Update of /home/cvs/slpdev/src/2.2/src/Python
In directory centera.de:/tmp/cvs-serv19228/2.2/src/Python

Modified Files:
	ceval.c 
Log Message:
initial working version.

Index: ceval.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/Python/ceval.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** ceval.c	2 May 2004 01:49:02 -0000	1.66
--- ceval.c	2 May 2004 15:07:06 -0000	1.67
***************
*** 2198,2201 ****
--- 2198,2204 ----
  		    if (PyCFunction_Check(func)) {
  			    int flags = PyCFunction_GET_FLAGS(func);
+ #ifdef STACKLESS
+ 			    flags &= ~METH_STACKLESS;
+ #endif
  			    if (nk != 0 || (flags & METH_KEYWORDS))
  				    x = do_call(func, &stack_pointer,
***************
*** 2204,2208 ****
--- 2207,2213 ----
  				    PyObject *callargs;
  				    callargs = load_args(&stack_pointer, na);
+ 				    STACKLESS_PROPOSE_ALL();
  				    x = PyCFunction_Call(func, callargs, NULL);
+ 				    STACKLESS_ASSERT();
  				    Py_XDECREF(callargs); 
  			    } else
***************
*** 2224,2229 ****
--- 2229,2236 ----
  				    Py_INCREF(func);
  			    if (PyFunction_Check(func)) {
+ 				    STACKLESS_PROPOSE_ALL();
  				    x = fast_function(func, &stack_pointer,
  						      n, na, nk);
+ 				    STACKLESS_ASSERT();
  			    } else {
  				    x = do_call(func, &stack_pointer,
***************
*** 3398,3402 ****
  }
  #else
! #define WRAP_RETURN(call) return (call)
  #endif
  
--- 3405,3409 ----
  }
  #else
! #define WRAP_RETURN(call) return (call);
  #endif
  
***************
*** 3412,3416 ****
  #else
  	switch (flags) {
! 		#endif
  	case METH_OLDARGS:
  		STACKLESS_PROPOSE_FLAG(flags & METH_STACKLESS);
--- 3419,3423 ----
  #else
  	switch (flags) {
! #endif
  	case METH_OLDARGS:
  		STACKLESS_PROPOSE_FLAG(flags & METH_STACKLESS);


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