Skip to content

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

Changed so that __basicnew__ is always available and calls regular 

constructor when EXTENSIONCLASS_BASICNEW_FLAG is not set.
parent 601a82f6
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 12 deletions
lib/Components/ExtensionClass/ExtensionClass.c
View file @ d3f55896
/* /*
$Id: ExtensionClass.c,v 1.18 1997/12/11 16:00:22 jim Exp $ $Id: ExtensionClass.c,v 1.19 1997/12/15 15:18:36 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.18 1997/12/11 16:00:22 jim Exp $\n" "$Id: ExtensionClass.c,v 1.19 1997/12/15 15:18:36 jim Exp $\n"
; ;
#include <stdio.h> #include <stdio.h>
...@@ -81,6 +81,7 @@ PyVar_Assign(PyObject **v, PyObject *e) ...@@ -81,6 +81,7 @@ PyVar_Assign(PyObject **v, PyObject *e)
#define ASSIGN(V,E) PyVar_Assign(&(V),(E)) #define ASSIGN(V,E) PyVar_Assign(&(V),(E))
#define UNLESS(E) if(!(E)) #define UNLESS(E) if(!(E))
#define UNLESS_ASSIGN(V,E) ASSIGN(V,E); UNLESS(V) #define UNLESS_ASSIGN(V,E) ASSIGN(V,E); UNLESS(V)
#define OBJECT(O) ((PyObject*)O)
/* Declarations for objects of type ExtensionClass */ /* Declarations for objects of type ExtensionClass */
...@@ -1335,6 +1336,9 @@ basicnew(PyExtensionClass *self, PyObject *args) ...@@ -1335,6 +1336,9 @@ basicnew(PyExtensionClass *self, PyObject *args)
return NULL; return NULL;
} }
UNLESS(self->class_flags & EXTENSIONCLASS_BASICNEW_FLAG)
return PyObject_CallObject(OBJECT(self), NULL);
if(self->tp_itemsize) if(self->tp_itemsize)
{ {
/* We have a variable-sized object, we need to get it's size */ /* We have a variable-sized object, we need to get it's size */
...@@ -1651,9 +1655,7 @@ CCL_getattro(PyExtensionClass *self, PyObject *name) ...@@ -1651,9 +1655,7 @@ CCL_getattro(PyExtensionClass *self, PyObject *name)
return PyString_FromString(self->tp_name); return PyString_FromString(self->tp_name);
break; break;
case 'b': case 'b':
if(self->class_flags & EXTENSIONCLASS_BASICNEW_FLAG && if(strcmp(n,"basicnew__")==0)
strcmp(n,"basicnew__")==0
)
return newCMethod(self,(PyObject*)self, return newCMethod(self,(PyObject*)self,
"__basicnew__",(PyCFunction)basicnew,0, "__basicnew__",(PyCFunction)basicnew,0,
"__basicnew__() -- " "__basicnew__() -- "
...@@ -3214,7 +3216,7 @@ void ...@@ -3214,7 +3216,7 @@ void
initExtensionClass() initExtensionClass()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.18 $"; char *rev="$Revision: 1.19 $";
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;
...@@ -3255,6 +3257,10 @@ initExtensionClass() ...@@ -3255,6 +3257,10 @@ initExtensionClass()
/**************************************************************************** /****************************************************************************
$Log: ExtensionClass.c,v $ $Log: ExtensionClass.c,v $
Revision 1.19 1997/12/15 15:18:36 jim
Changed so that __basicnew__ is always available and calls regular
constructor when EXTENSIONCLASS_BASICNEW_FLAG is not set.
Revision 1.18 1997/12/11 16:00:22 jim Revision 1.18 1997/12/11 16:00:22 jim
Added __basicnew__ class protocol. Added __basicnew__ class protocol.
......
lib/Components/ExtensionClass/src/ExtensionClass.c
View file @ d3f55896
/* /*
$Id: ExtensionClass.c,v 1.18 1997/12/11 16:00:22 jim Exp $ $Id: ExtensionClass.c,v 1.19 1997/12/15 15:18:36 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.18 1997/12/11 16:00:22 jim Exp $\n" "$Id: ExtensionClass.c,v 1.19 1997/12/15 15:18:36 jim Exp $\n"
; ;
#include <stdio.h> #include <stdio.h>
...@@ -81,6 +81,7 @@ PyVar_Assign(PyObject **v, PyObject *e) ...@@ -81,6 +81,7 @@ PyVar_Assign(PyObject **v, PyObject *e)
#define ASSIGN(V,E) PyVar_Assign(&(V),(E)) #define ASSIGN(V,E) PyVar_Assign(&(V),(E))
#define UNLESS(E) if(!(E)) #define UNLESS(E) if(!(E))
#define UNLESS_ASSIGN(V,E) ASSIGN(V,E); UNLESS(V) #define UNLESS_ASSIGN(V,E) ASSIGN(V,E); UNLESS(V)
#define OBJECT(O) ((PyObject*)O)
/* Declarations for objects of type ExtensionClass */ /* Declarations for objects of type ExtensionClass */
...@@ -1335,6 +1336,9 @@ basicnew(PyExtensionClass *self, PyObject *args) ...@@ -1335,6 +1336,9 @@ basicnew(PyExtensionClass *self, PyObject *args)
return NULL; return NULL;
} }
UNLESS(self->class_flags & EXTENSIONCLASS_BASICNEW_FLAG)
return PyObject_CallObject(OBJECT(self), NULL);
if(self->tp_itemsize) if(self->tp_itemsize)
{ {
/* We have a variable-sized object, we need to get it's size */ /* We have a variable-sized object, we need to get it's size */
...@@ -1651,9 +1655,7 @@ CCL_getattro(PyExtensionClass *self, PyObject *name) ...@@ -1651,9 +1655,7 @@ CCL_getattro(PyExtensionClass *self, PyObject *name)
return PyString_FromString(self->tp_name); return PyString_FromString(self->tp_name);
break; break;
case 'b': case 'b':
if(self->class_flags & EXTENSIONCLASS_BASICNEW_FLAG && if(strcmp(n,"basicnew__")==0)
strcmp(n,"basicnew__")==0
)
return newCMethod(self,(PyObject*)self, return newCMethod(self,(PyObject*)self,
"__basicnew__",(PyCFunction)basicnew,0, "__basicnew__",(PyCFunction)basicnew,0,
"__basicnew__() -- " "__basicnew__() -- "
...@@ -3214,7 +3216,7 @@ void ...@@ -3214,7 +3216,7 @@ void
initExtensionClass() initExtensionClass()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.18 $"; char *rev="$Revision: 1.19 $";
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;
...@@ -3255,6 +3257,10 @@ initExtensionClass() ...@@ -3255,6 +3257,10 @@ initExtensionClass()
/**************************************************************************** /****************************************************************************
$Log: ExtensionClass.c,v $ $Log: ExtensionClass.c,v $
Revision 1.19 1997/12/15 15:18:36 jim
Changed so that __basicnew__ is always available and calls regular
constructor when EXTENSIONCLASS_BASICNEW_FLAG is not set.
Revision 1.18 1997/12/11 16:00:22 jim Revision 1.18 1997/12/11 16:00:22 jim
Added __basicnew__ class protocol. Added __basicnew__ class protocol.
......
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