@@ -1,3 +1,20 @@
+2009/04/09 13:00:09 phil
+Print any exception raised by __dtor__.
+
+
+2009/04/01 15:07:01 phil
+Added support for PyQt4's support for signals that have overloaded methods.
+
+
+2009/03/30 19:48:55 phil
+Fixed a compiler warning message if sipCpp isn't used by %BIGetBufferCode.
+
+
+2009/03/30 12:48:19 phil
+Fixed the declaration of the module initialisation function when building
+static modules for Python v3.
+
+
2009/03/27 19:08:22 phil
Fixed a couple of missing calls to clear the error flag while parsing strings.
ChangeLog
@@ -22,7 +22,7 @@ import siputils
# Initialise the globals.
sip_version = 0x040800
-sip_version_str = "4.8-snapshot-20090327"
+sip_version_str = "4.8-snapshot-20090409"
py_version = sys.hexversion >> 8
plat_py_site_dir = None
plat_py_inc_dir = None
configure.py
@@ -301,7 +301,7 @@ ul.auto-toc {
<tr><th class="docinfo-name">Contact:</th>
<td><a class="first last reference" href="mailto:info@riverbankcomputing.com">info@riverbankcomputing.com</a></td></tr>
<tr><th class="docinfo-name">Version:</th>
-<td>4.8-snapshot-20090327</td></tr>
+<td>4.8-snapshot-20090409</td></tr>
<tr><th class="docinfo-name">Copyright:</th>
<td>Copyright (c) 2009 Riverbank Computing Limited</td></tr>
</tbody>
@@ -595,7 +595,7 @@ ul.auto-toc {
</div>
<div class="section">
<h1><a class="toc-backref" href="#id25" id="introduction" name="introduction">1 Introduction</a></h1>
-<p>This is the reference guide for SIP 4.8-snapshot-20090327. SIP is a tool for
+<p>This is the reference guide for SIP 4.8-snapshot-20090409. SIP is a tool for
automatically generating <a class="reference" href="http://www.python.org">Python</a> bindings for C and
C++ libraries. SIP was originally developed in 1998 for
<a class="reference" href="http://www.riverbankcomputing.com/software/pyqt/">PyQt</a> - the Python
doc/sipref.html
@@ -7,7 +7,7 @@
-----------------
:Contact: info@riverbankcomputing.com
-:Version: 4.8-snapshot-20090327
+:Version: 4.8-snapshot-20090409
:Copyright: Copyright (c) 2009 Riverbank Computing Limited
.. contents::
@@ -17,7 +17,7 @@
Introduction
============
-This is the reference guide for SIP 4.8-snapshot-20090327. SIP is a tool for
+This is the reference guide for SIP 4.8-snapshot-20090409. SIP is a tool for
automatically generating `Python <http://www.python.org>`__ bindings for C and
C++ libraries. SIP was originally developed in 1998 for
`PyQt <http://www.riverbankcomputing.com/software/pyqt/>`__ - the Python
doc/sipref.txt
@@ -40,7 +40,6 @@ typedef enum {
/* An entry in the sorted array of methods. */
typedef struct {
memberDef *md; /* The method. */
- int is_static; /* Set if all overloads are static. */
} sortedMethTab;
@@ -225,7 +224,8 @@ static int generateSubClassConvertors(sipSpec *pt, moduleDef *mod, FILE *fp);
static void generateNameCache(sipSpec *pt, FILE *fp);
static const char *resultOwner(overDef *od);
static void prCachedName(FILE *fp, nameDef *nd, const char *prefix);
-static void generateSignalTableEntry(classDef *cd, overDef *od, FILE *fp);
+static void generateSignalTableEntry(classDef *cd, overDef *sig, int membernr,
+ FILE *fp);
static void generateTypesTable(sipSpec *pt, moduleDef *mod, FILE *fp);
static int py2SlotOnly(slotType st);
static int keepPyReference(argDef *ad);
@@ -2076,14 +2076,16 @@ static void generateModInitStart(moduleDef *mod, int gen_c, FILE *fp)
"/* The Python module initialisation function. */\n"
"#if PY_MAJOR_VERSION >= 3\n"
"#define SIP_MODULE_ENTRY PyInit_%s\n"
+"#define SIP_MODULE_TYPE PyObject *\n"
"#define SIP_MODULE_RETURN(r) return (r)\n"
"#else\n"
"#define SIP_MODULE_ENTRY init%s\n"
+"#define SIP_MODULE_TYPE void\n"
"#define SIP_MODULE_RETURN(r) return\n"
"#endif\n"
"\n"
"#if defined(SIP_STATIC_MODULE)\n"
-"%svoid SIP_MODULE_ENTRY()\n"
+"%sSIP_MODULE_TYPE SIP_MODULE_ENTRY()\n"
"#else\n"
"PyMODINIT_FUNC SIP_MODULE_ENTRY()\n"
"#endif\n"
@@ -3386,8 +3388,6 @@ static sortedMethTab *createFunctionTable(classDef *cd,int *nrp)
for (md = cd->members; md != NULL; md = md->next)
{
mt->md = md;
- mt->is_static = TRUE;
-
++mt;
}
@@ -3458,14 +3458,13 @@ static sortedMethTab *createMethodTable(classDef *cd, int *nrp)
for (vl = cd->visible; vl != NULL; vl = vl->next)
{
- int need_method, is_static;
+ int need_method;
overDef *od;
if (vl->m->slot != no_slot)
continue;
need_method = FALSE;
- is_static = TRUE;
for (od = vl->cd->overs; od != NULL; od = od->next)
{
@@ -3477,19 +3476,12 @@ static sortedMethTab *createMethodTable(classDef *cd, int *nrp)
continue;
if (!skipOverload(od,vl->m,cd,vl->cd,TRUE))
- {
need_method = TRUE;
-
- if (!isPrivate(od) && !isStatic(od))
- is_static = FALSE;
- }
}
if (need_method)
{
mt->md = vl->m;
- mt->is_static = is_static;
-
++mt;
}
}
@@ -3540,18 +3532,12 @@ static int generateMethodTable(classDef *cd,FILE *fp)
{
memberDef *md = mtab[i].md;
- /*
- * For the moment we are suppressing the generation of
- * METH_STATIC until we understand descriptors better.
- * It could be that they will simplify the handling of
- * lazy attributes and allow things to be cached in the
- * type dictionary.
- */
- mtab[i].is_static = FALSE;
+ /* Save the index in the table. */
+ md->membernr = i;
prcode(fp,
-" {SIP_PYMETHODDEF_CAST(%N), meth_%C_%s, METH_VARARGS%s, NULL}%s\n"
- ,md->pyname,classFQCName(cd),md->pyname->text,(mtab[i].is_static ? "|METH_STATIC" : ""),((i + 1) < nr) ? "," : "");
+" {SIP_PYMETHODDEF_CAST(%N), meth_%C_%s, METH_VARARGS, NULL}%s\n"
+ , md->pyname, classFQCName(cd), md->pyname->text, ((i + 1) < nr) ? "," : "");
}
free(mtab);
@@ -4972,6 +4958,8 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd,
/* The buffer interface functions. */
if (cd->getbufcode != NULL)
{
+ int need_cpp = usedInCode(cd->getbufcode, "sipCpp");
+
prcode(fp,
"\n"
"\n"
@@ -4984,15 +4972,19 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd,
, classFQCName(cd));
prcode(fp,
-"static int getbuffer_%C(PyObject *%s, void *sipCppV, Py_buffer *sipBuffer, int %s)\n"
+"static int getbuffer_%C(PyObject *%s, void *%s, Py_buffer *sipBuffer, int %s)\n"
"{\n"
-" ", classFQCName(cd)
- , argName("sipSelf", cd->getbufcode)
- , argName("sipFlags", cd->getbufcode));
+ , classFQCName(cd), argName("sipSelf", cd->getbufcode), (generating_c || need_cpp ? "sipCppV" : ""), argName("sipFlags", cd->getbufcode));
- generateClassFromVoid(cd, "sipCpp", "sipCppV", fp);
+ if (need_cpp)
+ {
+ prcode(fp, " ");
+ generateClassFromVoid(cd, "sipCpp", "sipCppV", fp);
+ prcode(fp, ";\n"
+ );
+ }
- prcode(fp, ";\n"
+ prcode(fp,
" int sipRes;\n"
"\n"
);
@@ -8220,6 +8212,10 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
"};\n"
);
+ /* Generate the attributes tables. */
+ nr_methods = generateMethodTable(cd,fp);
+ nr_enums = generateEnumMemberTable(pt, mod, cd, fp);
+
/* Generate the PyQt4 signals table. */
is_signals = FALSE;
@@ -8229,6 +8225,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
for (md = cd->members; md != NULL; md = md->next)
{
overDef *od;
+ int membernr = md->membernr;
for (od = cd->overs; od != NULL; od = od->next)
{
@@ -8237,6 +8234,20 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
if (od->common != md || !isSignal(od))
continue;
+ if (membernr >= 0)
+ {
+ /* See if there is a non-signal overload. */
+
+ overDef *nsig;
+
+ for (nsig = cd->overs; nsig != NULL; nsig = nsig->next)
+ if (nsig != od && nsig->common == md && !isSignal(nsig))
+ break;
+
+ if (nsig == NULL)
+ membernr = -1;
+ }
+
if (!is_signals)
{
is_signals = TRUE;
@@ -8245,15 +8256,16 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
"\n"
"\n"
"/* Define this type's PyQt4 signals. */\n"
-"static const char *pyqt4_signals_%C[] = {\n"
- , classFQCName(cd));
+"static const pyqt4QtSignal pyqt4_signals_%C[] = {\n"
+ , classFQCName(cd));
}
/*
* Default arguments are handled as multiple signals. We make
* sure the largest is first and the smallest last.
*/
- generateSignalTableEntry(cd, od, fp);
+ generateSignalTableEntry(cd, od, membernr, fp);
+ membernr = -1;
nr_args = od->cppsig->nrArgs;
@@ -8263,7 +8275,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
break;
od->cppsig->nrArgs = a;
- generateSignalTableEntry(cd, od, fp);
+ generateSignalTableEntry(cd, od, -1, fp);
}
od->cppsig->nrArgs = nr_args;
@@ -8272,15 +8284,11 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
if (is_signals)
prcode(fp,
-" 0\n"
+" {0, 0}\n"
"};\n"
);
}
- /* Generate the attributes tables. */
- nr_methods = generateMethodTable(cd,fp);
- nr_enums = generateEnumMemberTable(pt, mod, cd, fp);
-
/* Generate the variable handlers. */
nr_vars = 0;
@@ -8743,14 +8751,22 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
/*
* Generate an entry in the PyQt4 signal table.
*/
-static void generateSignalTableEntry(classDef *cd, overDef *od, FILE *fp)
+static void generateSignalTableEntry(classDef *cd, overDef *sig, int membernr,
+ FILE *fp)
{
prcode(fp,
-" \"%s(", od->cppname);
+" {\"%s(", sig->cppname);
- generateCalledArgs(cd, od->cppsig, Declaration, TRUE, fp);
+ generateCalledArgs(cd, sig->cppsig, Declaration, TRUE, fp);
- prcode(fp,")\",\n"
+ prcode(fp,")\", ");
+
+ if (membernr >= 0)
+ prcode(fp, "&methods_%C[%d]", classFQCName(cd), membernr);
+ else
+ prcode(fp, "0");
+
+ prcode(fp,"},\n"
);
}
sipgen/gencode.c
@@ -26,7 +26,7 @@
#define PACKAGE "sip"
#endif
-#define VERSION "4.8-snapshot-20090327"
+#define VERSION "4.8-snapshot-20090409"
/* Global variables - see sip.h for their meaning. */
sipgen/main.c
@@ -867,6 +867,7 @@ typedef struct _enumDef {
typedef struct _memberDef {
nameDef *pyname; /* The Python name. */
int memberflags; /* The member flags. */
+ int membernr; /* The index in the method table. */
slotType slot; /* The slot type. */
moduleDef *module; /* The owning module. */
struct _memberDef *next; /* Next in the list. */
sipgen/sip.h
@@ -51,7 +51,7 @@ extern "C" {
* Define the SIP version number.
*/
#define SIP_VERSION 0x040800
-#define SIP_VERSION_STR "4.8-snapshot-20090327"
+#define SIP_VERSION_STR "4.8-snapshot-20090409"
/*
@@ -1377,6 +1377,21 @@ typedef struct _pyqt3ClassTypeDef {
*/
/*
+ * The description of a Qt signal for PyQt4.
+ */
+typedef struct _pyqt4QtSignal {
+ /* The C++ name and signature of the signal. */
+ const char *signature;
+
+ /*
+ * If the signal is an overload of regular methods then this points to the
+ * code that implements those methods.
+ */
+ PyMethodDef *non_signals;
+} pyqt4QtSignal;
+
+
+/*
* This is the PyQt4-specific extension to the generated class type structure.
*/
typedef struct _pyqt4ClassTypeDef {
@@ -1402,7 +1417,7 @@ typedef struct _pyqt4ClassTypeDef {
* The table of signals emitted by the type. These are grouped by signal
* name.
*/
- const char **qt4_signals;
+ const pyqt4QtSignal *qt4_signals;
} pyqt4ClassTypeDef;
siplib/sip.h
@@ -465,14 +465,16 @@ static int objectify(const char *s, PyObject **objp);
*/
#if PY_MAJOR_VERSION >= 3
#define SIP_MODULE_ENTRY PyInit_sip
+#define SIP_MODULE_TYPE PyObject *
#define SIP_FATAL(s) return NULL
#else
#define SIP_MODULE_ENTRY initsip
+#define SIP_MODULE_TYPE void
#define SIP_FATAL(s) Py_FatalError(s)
#endif
#if defined(SIP_STATIC_MODULE)
-void SIP_MODULE_ENTRY(void)
+SIP_MODULE_TYPE SIP_MODULE_ENTRY(void)
#else
PyMODINIT_FUNC SIP_MODULE_ENTRY(void)
#endif
@@ -3839,6 +3841,10 @@ static void callPyDtor(sipSimpleWrapper *self)
/* Discard any result. */
Py_XDECREF(res);
+ /* Handle any error the best we can. */
+ if (PyErr_Occurred())
+ PyErr_Print();
+
SIP_RELEASE_GIL(sipGILState);
}
}
@@ -4621,7 +4627,10 @@ static int add_lazy_attrs(sipClassTypeDef *ctd)
}
}
- /* Get any lazy attributes from registered getters. */
+ /*
+ * Get any lazy attributes from registered getters. This must be done last
+ * to allow any existing attributes to be replaced.
+ */
for (ag = sipAttrGetters; ag != NULL; ag = ag->next)
if (ag->type == NULL || PyType_IsSubtype((PyTypeObject *)wt, ag->type))
if (ag->getter((sipTypeDef *)ctd, dict) < 0)
siplib/siplib.c
4b988d23eb47627dda821427b5293dbf46d7ae0f
Kevin Watters
kevinwatters@gmail.com
http://github.com/kevinw/sip/commit/a4721a75c79e2875612e2511da24304099122935
a4721a75c79e2875612e2511da24304099122935
2009-04-14T07:19:06-07:00
2009-04-14T07:19:06-07:00
sip-4.8-snapshot-20090409
10d19f07801469572e37d9a8eec537583f5f3f9d
Kevin Watters
kevinwatters@gmail.com