Skip to content

Z
Zope
Commit a6260a9a authored by Jim Fulton's avatar Jim Fulton
Browse files
Options

Changed the way that methods in pure mix-in classes are constructed. 

Now methods are wrapped in such a way that tricky wrapper objects
(like Acquisition wrappers) can bind them to wrapped objects.
parent 7ea258d2
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 30 deletions
lib/Components/ExtensionClass/ExtensionClass.c
View file @ a6260a9a
/* /*
$Id: ExtensionClass.c,v 1.26 1998/03/13 22:05:47 jim Exp $ $Id: ExtensionClass.c,v 1.27 1998/03/23 20:25:59 jim Exp $
Extension Class Extension Class
...@@ -65,7 +65,7 @@ static char ExtensionClass_module_documentation[] = ...@@ -65,7 +65,7 @@ static char ExtensionClass_module_documentation[] =
" - They provide access to unbound methods,\n" " - They provide access to unbound methods,\n"
" - They can be called to create instances.\n" " - They can be called to create instances.\n"
"\n" "\n"
"$Id: ExtensionClass.c,v 1.26 1998/03/13 22:05:47 jim Exp $\n" "$Id: ExtensionClass.c,v 1.27 1998/03/23 20:25:59 jim Exp $\n"
; ;
#include <stdio.h> #include <stdio.h>
...@@ -218,6 +218,7 @@ staticforward PyTypeObject CMethodType; ...@@ -218,6 +218,7 @@ staticforward PyTypeObject CMethodType;
#define UnboundCMethod_Check(O) \ #define UnboundCMethod_Check(O) \
((O)->ob_type==&CMethodType && ! ((CMethod*)(O))->self) ((O)->ob_type==&CMethodType && ! ((CMethod*)(O))->self)
#define AsCMethod(O) ((CMethod*)(O)) #define AsCMethod(O) ((CMethod*)(O))
#define CMETHOD(O) ((CMethod*)(O))
static PyObject * static PyObject *
...@@ -746,10 +747,28 @@ call_PMethod(PMethod *self, PyObject *inst, PyObject *args, PyObject *kw) ...@@ -746,10 +747,28 @@ call_PMethod(PMethod *self, PyObject *inst, PyObject *args, PyObject *kw)
{ {
PyObject *a; PyObject *a;
a=Py_BuildValue("(O)",inst); if(CMethod_Check(self->meth)
if(a) ASSIGN(a,PySequence_Concat(a,args)); && CMETHOD(self->meth)->type->tp_basicsize == sizeof(PyPureMixinObject)
if(a) ASSIGN(a,callMethodWithPossibleHook(inst,self->meth,a,kw)); && ! (CMETHOD(self->meth)->self)
return a; )
{
/* Special HACK^H^H^Hcase:
we are wrapping an abstract unbound CMethod */
if(HasMethodHook(inst) &&
/* This check prevents infinite recursion: */
CMETHOD(self->meth)->doc != hook_mark
)
return callCMethodWithHook(CMETHOD(self->meth),inst,args,kw);
return call_cmethod(CMETHOD(self->meth),inst,args,kw);
}
else
{
a=Py_BuildValue("(O)",inst);
if(a) ASSIGN(a,PySequence_Concat(a,args));
if(a) ASSIGN(a,callMethodWithPossibleHook(inst,self->meth,a,kw));
return a;
}
} }
static PyObject * static PyObject *
...@@ -1456,6 +1475,10 @@ initializeBaseExtensionClass(PyExtensionClass *self) ...@@ -1456,6 +1475,10 @@ initializeBaseExtensionClass(PyExtensionClass *self)
{ {
PyMethodChain *chain, top = { ECI_methods, NULL }; PyMethodChain *chain, top = { ECI_methods, NULL };
PyObject *dict; PyObject *dict;
int abstract;
/* Is this an abstract, or at least a dataless, class? */
abstract=self->tp_basicsize == sizeof(PyPureMixinObject);
self->ob_type=(PyTypeObject*)&ECType; self->ob_type=(PyTypeObject*)&ECType;
Py_INCREF(self->ob_type); Py_INCREF(self->ob_type);
...@@ -1482,14 +1505,20 @@ initializeBaseExtensionClass(PyExtensionClass *self) ...@@ -1482,14 +1505,20 @@ initializeBaseExtensionClass(PyExtensionClass *self)
{ {
if(ml->ml_meth) if(ml->ml_meth)
{ {
if(! PyMapping_HasKeyString(dict,ml->ml_name) && if(! PyMapping_HasKeyString(dict,ml->ml_name))
PyMapping_SetItemString( {
dict,ml->ml_name, PyObject *m;
newCMethod(self, NULL, ml->ml_name, ml->ml_meth,
ml->ml_flags, ml->ml_doc) UNLESS(m=newCMethod(self, NULL, ml->ml_name, ml->ml_meth,
) < 0 ml->ml_flags, ml->ml_doc))
) return NULL;
return NULL;
if(abstract) UNLESS_ASSIGN(m, newPMethod(self, m))
return NULL;
if(PyMapping_SetItemString(dict,ml->ml_name,m) < 0)
return NULL;
}
} }
else if(ml->ml_doc && *(ml->ml_doc)) else if(ml->ml_doc && *(ml->ml_doc))
{ {
...@@ -3320,7 +3349,7 @@ void ...@@ -3320,7 +3349,7 @@ void
initExtensionClass() initExtensionClass()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.26 $"; char *rev="$Revision: 1.27 $";
PURE_MIXIN_CLASS(Base, "Minimalbase class for Extension Classes", NULL); PURE_MIXIN_CLASS(Base, "Minimalbase class for Extension Classes", NULL);
PMethodType.ob_type=&PyType_Type; PMethodType.ob_type=&PyType_Type;
...@@ -3361,6 +3390,11 @@ initExtensionClass() ...@@ -3361,6 +3390,11 @@ initExtensionClass()
/**************************************************************************** /****************************************************************************
$Log: ExtensionClass.c,v $ $Log: ExtensionClass.c,v $
Revision 1.27 1998/03/23 20:25:59 jim
Changed the way that methods in pure mix-in classes are constructed.
Now methods are wrapped in such a way that tricky wrapper objects
(like Acquisition wrappers) can bind them to wrapped objects.
Revision 1.26 1998/03/13 22:05:47 jim Revision 1.26 1998/03/13 22:05:47 jim
Exposed issubclass test in CAPI. Exposed issubclass test in CAPI.
......
lib/Components/ExtensionClass/src/ExtensionClass.c
View file @ a6260a9a
/* /*
$Id: ExtensionClass.c,v 1.26 1998/03/13 22:05:47 jim Exp $ $Id: ExtensionClass.c,v 1.27 1998/03/23 20:25:59 jim Exp $
Extension Class Extension Class
...@@ -65,7 +65,7 @@ static char ExtensionClass_module_documentation[] = ...@@ -65,7 +65,7 @@ static char ExtensionClass_module_documentation[] =
" - They provide access to unbound methods,\n" " - They provide access to unbound methods,\n"
" - They can be called to create instances.\n" " - They can be called to create instances.\n"
"\n" "\n"
"$Id: ExtensionClass.c,v 1.26 1998/03/13 22:05:47 jim Exp $\n" "$Id: ExtensionClass.c,v 1.27 1998/03/23 20:25:59 jim Exp $\n"
; ;
#include <stdio.h> #include <stdio.h>
...@@ -218,6 +218,7 @@ staticforward PyTypeObject CMethodType; ...@@ -218,6 +218,7 @@ staticforward PyTypeObject CMethodType;
#define UnboundCMethod_Check(O) \ #define UnboundCMethod_Check(O) \
((O)->ob_type==&CMethodType && ! ((CMethod*)(O))->self) ((O)->ob_type==&CMethodType && ! ((CMethod*)(O))->self)
#define AsCMethod(O) ((CMethod*)(O)) #define AsCMethod(O) ((CMethod*)(O))
#define CMETHOD(O) ((CMethod*)(O))
static PyObject * static PyObject *
...@@ -746,10 +747,28 @@ call_PMethod(PMethod *self, PyObject *inst, PyObject *args, PyObject *kw) ...@@ -746,10 +747,28 @@ call_PMethod(PMethod *self, PyObject *inst, PyObject *args, PyObject *kw)
{ {
PyObject *a; PyObject *a;
a=Py_BuildValue("(O)",inst); if(CMethod_Check(self->meth)
if(a) ASSIGN(a,PySequence_Concat(a,args)); && CMETHOD(self->meth)->type->tp_basicsize == sizeof(PyPureMixinObject)
if(a) ASSIGN(a,callMethodWithPossibleHook(inst,self->meth,a,kw)); && ! (CMETHOD(self->meth)->self)
return a; )
{
/* Special HACK^H^H^Hcase:
we are wrapping an abstract unbound CMethod */
if(HasMethodHook(inst) &&
/* This check prevents infinite recursion: */
CMETHOD(self->meth)->doc != hook_mark
)
return callCMethodWithHook(CMETHOD(self->meth),inst,args,kw);
return call_cmethod(CMETHOD(self->meth),inst,args,kw);
}
else
{
a=Py_BuildValue("(O)",inst);
if(a) ASSIGN(a,PySequence_Concat(a,args));
if(a) ASSIGN(a,callMethodWithPossibleHook(inst,self->meth,a,kw));
return a;
}
} }
static PyObject * static PyObject *
...@@ -1456,6 +1475,10 @@ initializeBaseExtensionClass(PyExtensionClass *self) ...@@ -1456,6 +1475,10 @@ initializeBaseExtensionClass(PyExtensionClass *self)
{ {
PyMethodChain *chain, top = { ECI_methods, NULL }; PyMethodChain *chain, top = { ECI_methods, NULL };
PyObject *dict; PyObject *dict;
int abstract;
/* Is this an abstract, or at least a dataless, class? */
abstract=self->tp_basicsize == sizeof(PyPureMixinObject);
self->ob_type=(PyTypeObject*)&ECType; self->ob_type=(PyTypeObject*)&ECType;
Py_INCREF(self->ob_type); Py_INCREF(self->ob_type);
...@@ -1482,14 +1505,20 @@ initializeBaseExtensionClass(PyExtensionClass *self) ...@@ -1482,14 +1505,20 @@ initializeBaseExtensionClass(PyExtensionClass *self)
{ {
if(ml->ml_meth) if(ml->ml_meth)
{ {
if(! PyMapping_HasKeyString(dict,ml->ml_name) && if(! PyMapping_HasKeyString(dict,ml->ml_name))
PyMapping_SetItemString( {
dict,ml->ml_name, PyObject *m;
newCMethod(self, NULL, ml->ml_name, ml->ml_meth,
ml->ml_flags, ml->ml_doc) UNLESS(m=newCMethod(self, NULL, ml->ml_name, ml->ml_meth,
) < 0 ml->ml_flags, ml->ml_doc))
) return NULL;
return NULL;
if(abstract) UNLESS_ASSIGN(m, newPMethod(self, m))
return NULL;
if(PyMapping_SetItemString(dict,ml->ml_name,m) < 0)
return NULL;
}
} }
else if(ml->ml_doc && *(ml->ml_doc)) else if(ml->ml_doc && *(ml->ml_doc))
{ {
...@@ -3320,7 +3349,7 @@ void ...@@ -3320,7 +3349,7 @@ void
initExtensionClass() initExtensionClass()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.26 $"; char *rev="$Revision: 1.27 $";
PURE_MIXIN_CLASS(Base, "Minimalbase class for Extension Classes", NULL); PURE_MIXIN_CLASS(Base, "Minimalbase class for Extension Classes", NULL);
PMethodType.ob_type=&PyType_Type; PMethodType.ob_type=&PyType_Type;
...@@ -3361,6 +3390,11 @@ initExtensionClass() ...@@ -3361,6 +3390,11 @@ initExtensionClass()
/**************************************************************************** /****************************************************************************
$Log: ExtensionClass.c,v $ $Log: ExtensionClass.c,v $
Revision 1.27 1998/03/23 20:25:59 jim
Changed the way that methods in pure mix-in classes are constructed.
Now methods are wrapped in such a way that tricky wrapper objects
(like Acquisition wrappers) can bind them to wrapped objects.
Revision 1.26 1998/03/13 22:05:47 jim Revision 1.26 1998/03/13 22:05:47 jim
Exposed issubclass test in CAPI. Exposed issubclass test in CAPI.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7