[Stackless-checkins] CVS: slpdev/src/2.3/dev/Objects descrobject.c, 1.13, 1.14 methodobject.c, 1.9, 1.10

[Christian Tismer]

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

Modified Files:
	descrobject.c methodobject.c 
Log Message:
initial working version.

Index: descrobject.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Objects/descrobject.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** descrobject.c	29 Apr 2004 17:58:58 -0000	1.13
--- descrobject.c	2 May 2004 15:07:06 -0000	1.14
***************
*** 983,987 ****
  }
  #else
! #define WRAP_RETURN(call) return (call)
  #endif
  
--- 983,987 ----
  }
  #else
! #define WRAP_RETURN(call) return (call);
  #endif
  
***************
*** 997,1001 ****
  	if (wp->descr->d_base->flags & PyWrapperFlag_KEYWORDS) {
  		wrapperfunc_kwds wk = (wrapperfunc_kwds)wrapper;
! 		WRAP_RETURN( (*wk)(self, args, wp->descr->d_wrapped, kwds) );
  	}
  
--- 997,1001 ----
  	if (wp->descr->d_base->flags & PyWrapperFlag_KEYWORDS) {
  		wrapperfunc_kwds wk = (wrapperfunc_kwds)wrapper;
! 		WRAP_RETURN( (*wk)(self, args, wp->descr->d_wrapped, kwds) )
  	}
  
***************
*** 1006,1010 ****
  		return NULL;
  	}
! 	WRAP_RETURN( (*wrapper)(self, args, wp->descr->d_wrapped) );
  }
  
--- 1006,1010 ----
  		return NULL;
  	}
! 	WRAP_RETURN( (*wrapper)(self, args, wp->descr->d_wrapped) )
  }
  

Index: methodobject.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Objects/methodobject.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** methodobject.c	29 Apr 2004 17:58:58 -0000	1.9
--- methodobject.c	2 May 2004 15:07:06 -0000	1.10
***************
*** 70,74 ****
  }
  #else
! #define WRAP_RETURN(call) return (call)
  #endif
  
--- 70,74 ----
  }
  #else
! #define WRAP_RETURN(call) return (call);
  #endif
  
***************
*** 91,104 ****
  	case METH_VARARGS:
  		if (kw == NULL || PyDict_Size(kw) == 0)
! 			WRAP_RETURN( (*meth)(self, arg) );
  		break;
  	case METH_VARARGS | METH_KEYWORDS:
  	case METH_OLDARGS | METH_KEYWORDS:
! 		WRAP_RETURN( (*(PyCFunctionWithKeywords)meth)(self, arg, kw) );
  	case METH_NOARGS:
  		if (kw == NULL || PyDict_Size(kw) == 0) {
  			size = PyTuple_GET_SIZE(arg);
  			if (size == 0)
! 				WRAP_RETURN( (*meth)(self, NULL) );
  			PyErr_Format(PyExc_TypeError,
  			    "%.200s() takes no arguments (%d given)",
--- 91,104 ----
  	case METH_VARARGS:
  		if (kw == NULL || PyDict_Size(kw) == 0)
! 			WRAP_RETURN( (*meth)(self, arg) )
  		break;
  	case METH_VARARGS | METH_KEYWORDS:
  	case METH_OLDARGS | METH_KEYWORDS:
! 		WRAP_RETURN( (*(PyCFunctionWithKeywords)meth)(self, arg, kw) )
  	case METH_NOARGS:
  		if (kw == NULL || PyDict_Size(kw) == 0) {
  			size = PyTuple_GET_SIZE(arg);
  			if (size == 0)
! 				WRAP_RETURN( (*meth)(self, NULL) )
  			PyErr_Format(PyExc_TypeError,
  			    "%.200s() takes no arguments (%d given)",
***************
*** 111,115 ****
  			size = PyTuple_GET_SIZE(arg);
  			if (size == 1)
! 				WRAP_RETURN( (*meth)(self, PyTuple_GET_ITEM(arg, 0)) );
  			PyErr_Format(PyExc_TypeError,
  			    "%.200s() takes exactly one argument (%d given)",
--- 111,115 ----
  			size = PyTuple_GET_SIZE(arg);
  			if (size == 1)
! 				WRAP_RETURN( (*meth)(self, PyTuple_GET_ITEM(arg, 0)) )
  			PyErr_Format(PyExc_TypeError,
  			    "%.200s() takes exactly one argument (%d given)",
***************
*** 126,130 ****
  			else if (size == 0)
  				arg = NULL;
! 			WRAP_RETURN( (*meth)(self, arg) );
  		}
  		break;
--- 126,130 ----
  			else if (size == 0)
  				arg = NULL;
! 			WRAP_RETURN( (*meth)(self, arg) )
  		}
  		break;


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