siplib/descriptors.c
@@ -22,3 +22,5 @@ sipconfig.py
.project
.pydevproject
+
+*.suo
.gitignore
@@ -1,3 +1,479 @@
+2009/02/25 23:13:36 phil
+Reverted to using type's and object's attribute getters and setters now that we
+populate the type dictionary of a generated type with all its lazy attributes
+in one go.
+Changed how an external attributer getter works now that it only needs to
+populate the type dictionary.
+
+
+2009/02/25 21:43:38 phil
+Safety checking of the working (but still to be changed) attribute lookup code.
+
+
+2009/02/25 15:13:32 phil
+Refactored the support for setting instance variables.
+
+
+2009/02/25 10:00:00 phil
+The refactored support for getting variables now works.
+
+
+2009/02/24 16:19:51 phil
+Safety commit of refactored wrapping of class variables.
+
+
+2009/02/23 22:21:08 phil
+Fixed the problem with looking up external lazy attributes - wrapped variables
+are the only thing not working.
+
+
+2009/02/23 18:29:11 phil
+Safety commit of new attribute lookup code. Don't use this - it's broken.
+
+
+2009/02/23 10:45:53 phil
+Fixed a reference count leak when an external lazy attribute was a descriptor.
+
+
+2009/02/23 6:41:29 phil
+Fixed a crash when accessing a wrapped instance variable as a class variable.
+
+
+2009/02/22 22:52:22 phil
+Fixed a bug in the refactored attribute lookup.
+
+
+2009/02/22 19:05:10 phil
+Completed the support for the lazy attribute lookup hook.
+
+
+2009/02/21 19:03:54 phil
+Added initial support for registering lazy attribute getters.
+
+
+2009/02/21 11:20:27 phil
+The PyQt4 signal table is now generated.
+The XML export now marks the default signal.
+
+
+2009/02/20 10:55:59 phil
+Added the stub of signal table for PyQt4.
+
+
+2009/02/16 22:24:40 phil
+Removed some compiler warnings.
+
+
+2009/02/14 16:58:56 phil
+More signal/slot refactoring fixes.
+
+
+2009/02/14 16:26:47 phil
+Debugged the signal/slot refactoring.
+
+
+2009/02/14 14:36:06 phil
+Safety commit of latest signal/slot refactoring.
+
+
+2009/02/13 19:02:22 phil
+Fixed a build problem with Python 2.4.x and earlier.
+
+
+2009/02/13 17:05:13 phil
+PyQt3 signal support is now enabled with the %Plugin directive instead of
+%SIPOptions.
+Removed %SIPOptions.
+
+
+2009/02/13 16:36:26 phil
+The generated typedefs table is now sorted.
+
+
+2009/02/12 22:16:12 phil
+An unconstrained enum can now be a sub-class of int.
+
+
+2009/02/11 23:11:35 phil
+Renamed TypeFlags to PyQt4Flags.
+Renamed NoQMetaObject to PyQt4NoQMetaObject.
+Moved the type flags into the PyQt4-specific type structure.
+
+
+2009/02/11 20:31:43 phil
+Removed the registration of wrapped types with the Qt meta-type system as it is
+no longer needed by PyQt4.
+
+
+2009/02/07 17:00:39 phil
+Removed sipAssignType() and moved the helpers to the PyQt4 plugin.
+
+
+2009/02/02 10:54:38 phil
+The QObject.sender() support is now PyQt3 only again.
+
+
+2009/02/01 23:26:59 phil
+Fixed a bug in the generation of the sipParseArgs() sub-format character for
+types.
+
+
+2009/02/01 17:08:49 phil
+Changed the QObject::sender() support for PyQt4.
+
+
+2009/02/01 14:50:36 phil
+Debugged the merged types table.
+
+
+2009/01/31 17:20:21 phil
+Safety commit of the merge of the class, mapped types and enum tables.
+
+
+2009/01/30 18:10:53 phil
+Wrapped classes are now created as they are needed and not in the order they
+appear in the generated class table. Therefore the class, mapped type and enum
+tables can now be merged and ordered by the type name (and searched using a
+binary search).
+
+
+2009/01/29 18:22:23 phil
+Moved the last of the type parsing to PyQt3.
+
+
+2009/01/29 14:43:13 phil
+Moved the registering of int types to PyQt4.
+
+
+2009/01/28 22:54:42 phil
+Refactored the support for looking up typedefs.
+
+
+2009/01/28 12:43:56 phil
+Moved the type parsing support to PyQt3.
+
+
+2009/01/27 9:40:29 phil
+Removed a remaining call to sipReleaseMappedType().
+
+
+2009/01/25 16:32:39 phil
+Fixed a too-few-arguments-to-a-print bug in the code generator.
+
+
+2009/01/25 13:29:37 phil
+Fixed compilation issues.
+
+
+2009/01/18 17:57:34 phil
+Replaced sipFindConnection() with sipFindSlot().
+
+
+2009/01/13 22:21:13 phil
+Replaced sipFreeConnection() with sipFreeSipslot().
+
+
+2009/01/12 22:41:31 phil
+Pushed the parsing of signatures into PyQt.
+
+
+2009/01/11 17:14:59 phil
+Replaced sipConvertRx() with sipConvertRxEx().
+
+
+2009/01/10 17:12:48 phil
+Removed the generation of an old Qt API entry.
+
+
+2009/01/09 19:29:02 phil
+Safety commit of partial refactoring of the Qt signal support.
+
+
+2009/01/04 22:21:36 phil
+Don't import the qt_register_type symbol if it isn't needed.
+Updated copyright notices.
+
+
+2008/12/30 14:54:42 phil
+sipTypeFromPyTypeObject() now takes a PyTypeObject* rather than a PyObject*.
+
+
+2008/12/30 14:11:19 phil
+Added sipTypeName() and sipTypeScope() to the public SIP API.
+
+
+2008/12/29 14:30:17 phil
+Migrated sipEnum_* to sipType_*.
+
+
+2008/12/27 18:23:34 phil
+sipType_* are now generated for enums. These are used internally but the SIP
+API has not yet been changed.
+
+
+2008/12/27 15:48:11 phil
+Broke out the generated type structures for mapped and class types to different
+structures with a common header.
+
+
+2008/12/26 14:24:26 phil
+Wrapped enums now have their own meta-type. This is the hook that will allow
+the C++ name of an enum to be derived from the enum's Python type object.
+
+
+2008/12/24 23:37:59 phil
+Added sip_api_init_module() to make sure dependent modules can be fully
+initialised before they are needed.
+
+
+2008/12/24 17:52:54 phil
+Removed the Qt meta-type id from the pyqt4TypeDef structure as we want to use
+it for mapped types as well but we would never know when it was safe to cast
+from a sipTypeDef pointer.
+
+
+2008/12/21 17:05:22 phil
+The PyQt4-specific extension to the generated type structure is now used for
+mapped types as well.
+
+
+2008/12/20 21:16:38 phil
+Changed the PyQt4-specifc handling of Qt meta-type registration.
+
+
+2008/12/20 16:42:50 phil
+A generated type structure now has its Python type object set earlier so that
+sub-meta-types can use sipIsExactWrappedType().
+Calls to QObject::metaObject() are no longer need to trigger the creation of
+the meta-object.
+
+
+2008/12/20 13:28:14 phil
+Added %Plugin and use it to support pyqt4TypeDef.
+
+
+2008/12/19 19:14:27 phil
+Moved the qt_qobject member out of sipWrapperType and into PyQt where it
+belongs.
+
+
+2008/12/19 17:21:42 phil
+Completed the migration of sipClass_* to sipType_*.
+
+
+2008/12/19 11:07:33 phil
+Documentation updates. All uses of sipClass_* are only by deprecated parts of
+the API.
+
+
+2008/12/19 11:03:12 phil
+Deprecated the 'B' and 'C' format characters to sipBuildResult() and
+sipCallMethod().
+Added the new 'N' format character to sipBuildResult() and sipCallMethod().
+
+
+2008/12/17 22:25:19 phil
+Deprecated the 'C' format character of sipParseResult() in favor of the
+existing 'D' character.
+
+
+2008/12/17 17:25:51 phil
+Migrated the sub-class convertor code to using sipType rather than sipClass.
+
+
+2008/12/16 15:19:31 phil
+Fixed a bug where names of mapped type templates where being generated for
+modules that didn't need them.
+
+
+2008/12/14 17:02:44 phil
+Replaced the deprecated sipConvertFromInstance() and
+sipConvertFromNewInstance() with sipConvertFromType() and
+sipConvertFromNewType().
+
+
+2008/12/14 15:41:40 phil
+Replaced the deprecated sipForceConvertToInstance() and
+sipForceConvertToMappedType() with sipForceConvertToType().
+
+
+2008/12/14 15:04:45 phil
+Replaced the deprecated sipConvertToInstance() and sipConvertToMappedType()
+with sipConvertToType().
+
+
+2008/12/14 14:20:21 phil
+Replaced the deprecated sipCanConvertToInstance() and
+sipCanConvertToMappedType() by sipCanConvertToType().
+
+
+2008/12/13 19:40:56 phil
+Replaced the deprecated sipReleaseInstance() and sipReleaseMappedType() with
+sipReleaseType().
+
+
+2008/12/13 18:51:27 phil
+Replaced the deprecated sipGetWrapper() with sipGetPyObject().
+
+
+2008/12/13 18:02:31 phil
+More moves from sipClass_* to sipType_*.
+
+
+2008/12/13 14:10:14 phil
+More conversions from sipClass_* to sipType_*.
+
+
+2008/12/12 23:51:34 phil
+Merged the adding of type instances.
+
+
+2008/12/08 21:04:07 phil
+Started the port from sipClass_* to sipType_*.
+Added support for assert() to the build system.
+
+
+2008/12/08 19:43:28 phil
+Renamed sipMappedType_* to sipType_*.
+
+
+2008/12/07 22:37:14 phil
+Added sipType_* for wrapped types. sipClass_* is now defined in terms of
+sipType_*.
+
+
+2008/12/07 17:32:13 phil
+Deprecated sipClassName().
+
+
+2008/12/07 17:01:36 phil
+Mapped types are now described by the same sipTypeDef structure that describes
+wrapped types.
+
+
+2008/12/06 21:48:47 phil
+Moved the 'user' field from sip.wrapper to sip.simplewrapper because PyQt uses
+it for some non-QObject types.
+
+
+2008/12/06 17:35:53 phil
+Restored %DefaultMetatype and the /Metatype/ class annotation. This support is
+now complete.
+Documented the meta-type and super-type support.
+
+
+2008/12/03 22:06:16 phil
+Code generator changes to support sipSimpleWrapper.
+
+
+2008/12/03 18:29:39 phil
+The sip module now compiles again without any unexpected warnings.
+
+
+2008/12/02 22:26:37 phil
+Various compilation fixes.
+
+
+2008/12/01 21:03:13 phil
+Safety checkin of the support for the new sip.simplewrapper type.
+
+
+2008/12/01 9:20:22 phil
+Added support for %InitialisationCode. (Actually in the previous commit but I
+forgotto mention it.)
+The text of an attribute exception now mimics that produced by the Python
+interpreter.
+
+
+2008/11/30 18:48:26 phil
+Refactored the super-type and meta-type support. Meta-types are now handled
+implicitly.
+
+
+2008/11/29 16:26:42 phil
+Debugged the metatype support.
+
+
+2008/11/27 22:44:38 phil
+The metatypes are now registered and readied.
+
+
+2008/11/27 0:12:18 phil
+Fixes for various regressions.
+
+
+2008/11/26 22:47:48 phil
+Use the string pool for calls to qRegisterMetaType().
+
+
+2008/11/26 22:40:16 phil
+Completed the code generator support for user defined metatypes.
+
+
+2008/11/24 22:33:00 phil
+Added the parser support for %Metatype and %DefaultMetatype.
+
+
+2008/11/23 15:31:13 phil
+The string pool now overlaps strings where possible.
+
+
+2008/11/23 14:41:09 phil
+Enum names now use the string pool.
+
+
+2008/11/23 12:28:44 phil
+Fixed a regression in the handling of nested namespaces.
+
+
+2008/11/23 0:29:01 phil
+Python and C++ type names now use the string pool.
+The string pool is currently broken for namespace extenders.
+
+
+2008/11/22 17:03:12 phil
+The generated name cache is now a single (const) string.
+
+
+2008/11/22 14:27:24 phil
+Removed all deprecated parts of the API and generated code.
+
+
+2008/11/21 17:03:06 phil
+Use "-undefined dynamic_lookup" rather than linking against the Python
+framework on MacOS.
+
+
+2008/11/18 10:56:01 phil
+Added sipWrapperType_Check() to the public API.
+
+
+2008/11/17 13:43:32 phil
+Merged v4.7.9 into the trunk.
+
+
+2008/11/17 13:39:28 phil
+Released as v4.7.9.
+
+
+2008/11/13 18:36:49 phil
+The new handling of the typedef names was correctly using the real types for
+virtual handler arguments but not the return values.
+
+
+2008/11/08 15:15:51 phil
+Merged v4.7.8 into the trunk.
+
+
+2008/11/08 11:50:56 phil
+Released as v4.7.8.
+
+
+2008/11/06 22:23:05 phil
+Fixed a minor code generating bug that caused too many blank lines to be
+generated with consolidated modules.
+
+
2008/11/02 14:53:09 phil
Fixed a bug in the detection of reimplemented methods when the method is a
Python special method (ie. when the attribute is a method wrapper).
ChangeLog
@@ -1,45 +1,50 @@
-RIVERBANK COMPUTING LIMITED LICENSE AGREEMENT FOR SIP 4.7.8
+RIVERBANK COMPUTING LIMITED LICENSE AGREEMENT FOR SIP 4.8
1. This LICENSE AGREEMENT is between Riverbank Computing Limited
("Riverbank"), and the Individual or Organization ("Licensee") accessing
-and otherwise using SIP 4.7.8 software in source or binary form and its
-associated documentation.
+and otherwise using SIP 4.8 software in source or binary form and its
+associated documentation. SIP 4.8 comprises a software tool for
+generating Python bindings for software C and C++ libraries, and a Python
+extension module used at runtime by those generated bindings.
2. Subject to the terms and conditions of this License Agreement, Riverbank
hereby grants Licensee a nonexclusive, royalty-free, world-wide license
to reproduce, analyze, test, perform and/or display publicly, prepare
-derivative works, distribute, and otherwise use SIP 4.7.8 alone or in
+derivative works, distribute, and otherwise use SIP 4.8 alone or in
any derivative version, provided, however, that Riverbank's License
-Agreement and Riverbank's notice of copyright, e.g., "Copyright (c) 2008
+Agreement and Riverbank's notice of copyright, e.g., "Copyright (c) 2009
Riverbank Computing Limited; All Rights Reserved" are retained in
-SIP 4.7.8 alone or in any derivative version prepared by Licensee.
+SIP 4.8 alone or in any derivative version prepared by Licensee.
3. In the event Licensee prepares a derivative work that is based on
-or incorporates SIP 4.7.8 or any part thereof, and wants to make
+or incorporates SIP 4.8 or any part thereof, and wants to make
the derivative work available to others as provided herein, then
Licensee hereby agrees to include in any such work a brief summary of
-the changes made to SIP 4.7.8.
+the changes made to SIP 4.8.
-4. Riverbank is making SIP 4.7.8 available to Licensee on an "AS IS"
+4. Licensee may not use SIP 4.8 to generate Python bindings for any
+C or C++ library for which bindings are already provided by Riverbank.
+
+5. Riverbank is making SIP 4.8 available to Licensee on an "AS IS"
basis. RIVERBANK MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, RIVERBANK MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF SIP 4.7.8 WILL NOT
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF SIP 4.8 WILL NOT
INFRINGE ANY THIRD PARTY RIGHTS.
-5. RIVERBANK SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF
-SIP 4.7.8 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
-AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING SIP 4.7.8,
+6. RIVERBANK SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF
+SIP 4.8 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING SIP 4.8,
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-6. This License Agreement will automatically terminate upon a material
+7. This License Agreement will automatically terminate upon a material
breach of its terms and conditions.
-7. Nothing in this License Agreement shall be deemed to create any
+8. Nothing in this License Agreement shall be deemed to create any
relationship of agency, partnership, or joint venture between Riverbank
and Licensee. This License Agreement does not grant permission to use
Riverbank trademarks or trade name in a trademark sense to endorse or
promote products or services of Licensee, or any third party.
-8. By copying, installing or otherwise using SIP 4.7.8, Licensee
+9. By copying, installing or otherwise using SIP 4.8, Licensee
agrees to be bound by the terms and conditions of this License Agreement.
LICENSE
@@ -1,4 +1,11 @@
-v4.7.8 ??? Nov 2008
+v4.8 ???
+ - Added the %InitialisationCode directive.
+ - super() now works as expected.
+
+v4.7.9 17th November 2008
+ - A bug fix release.
+
+v4.7.8 8th November 2008
- Added the /Deprecated/ class and function annotation (based on a patch from
Lorenzo Berni).
- Templates now support instance variables and enums.
@@ -10,7 +17,7 @@ v4.7.8 ??? Nov 2008
what the compiler sees. The /NoTypeName/ typedef annotation can be used to
suppress this behaviour.
-v4.7.7 8th Aug 2008
+v4.7.7 8th August 2008
- C++ structs are now properly handled as a class with a default public
section.
- sip.dump() now includes the object's first child wrapper.
NEWS
@@ -1,6 +1,6 @@
# This script handles the SIP configuration and generates the Makefiles.
#
-# Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
+# Copyright (c) 2009 Riverbank Computing Limited <info@riverbankcomputing.com>
#
# This file is part of SIP.
#
@@ -22,8 +22,8 @@ import siputils
# Initialise the globals.
-sip_version = 0x040708
-sip_version_str = "4.7.8-snapshot-20081102"
+sip_version = 0x040800
+sip_version_str = "4.8-snapshot-20090225"
py_version = sys.hexversion >> 8
plat_py_site_dir = None
plat_py_inc_dir = None
@@ -45,7 +45,6 @@ opt_sipincdir = None
opt_sipsipdir = None
opt_static = 0
opt_debug = 0
-opt_export_all = 0
opt_universal = None
# The names of build macros extracted from the platform specific configuration
@@ -254,7 +253,6 @@ def create_config(module, template, macros):
"default_bin_dir": plat_bin_dir,
"default_mod_dir": plat_py_site_dir,
"default_sip_dir": opt_sipsipdir,
- "export_all": opt_export_all,
"py_version": py_version,
"py_inc_dir": plat_py_inc_dir,
"py_conf_inc_dir": plat_py_conf_inc_dir,
@@ -336,20 +334,18 @@ def main(argv):
set_defaults()
try:
- optlist, args = getopt.getopt(argv[1:], "hab:d:e:knp:s:uv:")
+ optlist, args = getopt.getopt(argv[1:], "hb:d:e:knp:s:uv:")
except getopt.GetoptError:
usage()
global opt_sipbindir, opt_sipmoddir, opt_sipincdir, opt_sipsipdir
- global opt_platform, opt_static, opt_debug, opt_export_all, opt_universal
+ global opt_platform, opt_static, opt_debug, opt_universal
sdk = DEFAULT_MACOSX_SDK
for opt, arg in optlist:
if opt == "-h":
usage(0)
- elif opt == "-a":
- opt_export_all = 1
elif opt == "-b":
opt_sipbindir = os.path.abspath(arg)
elif opt == "-d":
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.7.8-snapshot-20081102</td></tr>
+<td>4.8-snapshot-20090225</td></tr>
<tr><th class="docinfo-name">Copyright:</th>
<td>Copyright (c) 2008 Riverbank Computing Limited</td></tr>
</tbody>
@@ -317,254 +317,279 @@ ul.auto-toc {
</ul>
</li>
<li><a class="reference" href="#potential-incompatibilities-with-earlier-versions" id="id30" name="id30">2 Potential Incompatibilities with Earlier Versions</a><ul class="auto-toc">
-<li><a class="reference" href="#sip-v4-7-8" id="id31" name="id31">2.1 SIP v4.7.8</a></li>
-<li><a class="reference" href="#sip-v4-7-3" id="id32" name="id32">2.2 SIP v4.7.3</a></li>
-<li><a class="reference" href="#sip-v4-4" id="id33" name="id33">2.3 SIP v4.4</a></li>
+<li><a class="reference" href="#sip-v4-8" id="id31" name="id31">2.1 SIP v4.8</a></li>
+<li><a class="reference" href="#sip-v4-7-8" id="id32" name="id32">2.2 SIP v4.7.8</a></li>
+<li><a class="reference" href="#sip-v4-7-3" id="id33" name="id33">2.3 SIP v4.7.3</a></li>
+<li><a class="reference" href="#sip-v4-4" id="id34" name="id34">2.4 SIP v4.4</a></li>
</ul>
</li>
-<li><a class="reference" href="#installing-sip" id="id34" name="id34">3 Installing SIP</a><ul class="auto-toc">
-<li><a class="reference" href="#downloading-sip" id="id35" name="id35">3.1 Downloading SIP</a></li>
-<li><a class="reference" href="#configuring-sip" id="id36" name="id36">3.2 Configuring SIP</a><ul class="auto-toc">
-<li><a class="reference" href="#configuring-sip-using-mingw" id="id37" name="id37">3.2.1 Configuring SIP Using MinGW</a></li>
-<li><a class="reference" href="#configuring-sip-using-the-borland-c-compiler" id="id38" name="id38">3.2.2 Configuring SIP Using the Borland C++ Compiler</a></li>
+<li><a class="reference" href="#installing-sip" id="id35" name="id35">3 Installing SIP</a><ul class="auto-toc">
+<li><a class="reference" href="#downloading-sip" id="id36" name="id36">3.1 Downloading SIP</a></li>
+<li><a class="reference" href="#configuring-sip" id="id37" name="id37">3.2 Configuring SIP</a><ul class="auto-toc">
+<li><a class="reference" href="#configuring-sip-using-mingw" id="id38" name="id38">3.2.1 Configuring SIP Using MinGW</a></li>
+<li><a class="reference" href="#configuring-sip-using-the-borland-c-compiler" id="id39" name="id39">3.2.2 Configuring SIP Using the Borland C++ Compiler</a></li>
</ul>
</li>
-<li><a class="reference" href="#building-sip" id="id39" name="id39">3.3 Building SIP</a></li>
+<li><a class="reference" href="#building-sip" id="id40" name="id40">3.3 Building SIP</a></li>
</ul>
</li>
-<li><a class="reference" href="#using-sip" id="id40" name="id40">4 Using SIP</a><ul class="auto-toc">
-<li><a class="reference" href="#a-simple-c-example" id="id41" name="id41">4.1 A Simple C++ Example</a></li>
-<li><a class="reference" href="#id7" id="id42" name="id42">4.2 A Simple C Example</a></li>
-<li><a class="reference" href="#a-more-complex-c-example" id="id43" name="id43">4.3 A More Complex C++ Example</a></li>
-<li><a class="reference" href="#ownership-of-objects" id="id44" name="id44">4.4 Ownership of Objects</a></li>
-<li><a class="reference" href="#support-for-python-s-buffer-interface" id="id45" name="id45">4.5 Support for Python's Buffer Interface</a></li>
-<li><a class="reference" href="#support-for-wide-characters" id="id46" name="id46">4.6 Support for Wide Characters</a></li>
-<li><a class="reference" href="#the-python-global-interpreter-lock" id="id47" name="id47">4.7 The Python Global Interpreter Lock</a></li>
+<li><a class="reference" href="#using-sip" id="id41" name="id41">4 Using SIP</a><ul class="auto-toc">
+<li><a class="reference" href="#a-simple-c-example" id="id42" name="id42">4.1 A Simple C++ Example</a></li>
+<li><a class="reference" href="#id7" id="id43" name="id43">4.2 A Simple C Example</a></li>
+<li><a class="reference" href="#a-more-complex-c-example" id="id44" name="id44">4.3 A More Complex C++ Example</a></li>
+<li><a class="reference" href="#ownership-of-objects" id="id45" name="id45">4.4 Ownership of Objects</a></li>
+<li><a class="reference" href="#types-and-meta-types" id="id46" name="id46">4.5 Types and Meta-types</a></li>
+<li><a class="reference" href="#lazy-type-attributes" id="id47" name="id47">4.6 Lazy Type Attributes</a></li>
+<li><a class="reference" href="#support-for-python-s-buffer-interface" id="id48" name="id48">4.7 Support for Python's Buffer Interface</a></li>
+<li><a class="reference" href="#support-for-wide-characters" id="id49" name="id49">4.8 Support for Wide Characters</a></li>
+<li><a class="reference" href="#the-python-global-interpreter-lock" id="id50" name="id50">4.9 The Python Global Interpreter Lock</a></li>
</ul>
</li>
-<li><a class="reference" href="#the-sip-command-line" id="id48" name="id48">5 The SIP Command Line</a></li>
-<li><a class="reference" href="#sip-specification-files" id="id49" name="id49">6 SIP Specification Files</a><ul class="auto-toc">
-<li><a class="reference" href="#syntax-definition" id="id50" name="id50">6.1 Syntax Definition</a></li>
-<li><a class="reference" href="#variable-numbers-of-arguments" id="id51" name="id51">6.2 Variable Numbers of Arguments</a></li>
-<li><a class="reference" href="#additional-sip-types" id="id52" name="id52">6.3 Additional SIP Types</a><ul class="auto-toc">
-<li><a class="reference" href="#sip-anyslot" id="id53" name="id53">6.3.1 SIP_ANYSLOT</a></li>
-<li><a class="reference" href="#sip-pycallable" id="id54" name="id54">6.3.2 SIP_PYCALLABLE</a></li>
-<li><a class="reference" href="#sip-pydict" id="id55" name="id55">6.3.3 SIP_PYDICT</a></li>
-<li><a class="reference" href="#sip-pylist" id="id56" name="id56">6.3.4 SIP_PYLIST</a></li>
-<li><a class="reference" href="#sip-pyobject" id="id57" name="id57">6.3.5 SIP_PYOBJECT</a></li>
-<li><a class="reference" href="#sip-pyslice" id="id58" name="id58">6.3.6 SIP_PYSLICE</a></li>
-<li><a class="reference" href="#sip-pytuple" id="id59" name="id59">6.3.7 SIP_PYTUPLE</a></li>
-<li><a class="reference" href="#sip-pytype" id="id60" name="id60">6.3.8 SIP_PYTYPE</a></li>
-<li><a class="reference" href="#sip-qobject" id="id61" name="id61">6.3.9 SIP_QOBJECT</a></li>
-<li><a class="reference" href="#sip-rxobj-con" id="id62" name="id62">6.3.10 SIP_RXOBJ_CON</a></li>
-<li><a class="reference" href="#sip-rxobj-dis" id="id63" name="id63">6.3.11 SIP_RXOBJ_DIS</a></li>
-<li><a class="reference" href="#sip-signal" id="id64" name="id64">6.3.12 SIP_SIGNAL</a></li>
-<li><a class="reference" href="#sip-slot" id="id65" name="id65">6.3.13 SIP_SLOT</a></li>
-<li><a class="reference" href="#sip-slot-con" id="id66" name="id66">6.3.14 SIP_SLOT_CON</a></li>
-<li><a class="reference" href="#sip-slot-dis" id="id67" name="id67">6.3.15 SIP_SLOT_DIS</a></li>
+<li><a class="reference" href="#the-sip-command-line" id="id51" name="id51">5 The SIP Command Line</a></li>
+<li><a class="reference" href="#sip-specification-files" id="id52" name="id52">6 SIP Specification Files</a><ul class="auto-toc">
+<li><a class="reference" href="#syntax-definition" id="id53" name="id53">6.1 Syntax Definition</a></li>
+<li><a class="reference" href="#variable-numbers-of-arguments" id="id54" name="id54">6.2 Variable Numbers of Arguments</a></li>
+<li><a class="reference" href="#additional-sip-types" id="id55" name="id55">6.3 Additional SIP Types</a><ul class="auto-toc">
+<li><a class="reference" href="#sip-anyslot" id="id56" name="id56">6.3.1 SIP_ANYSLOT</a></li>
+<li><a class="reference" href="#sip-pycallable" id="id57" name="id57">6.3.2 SIP_PYCALLABLE</a></li>
+<li><a class="reference" href="#sip-pydict" id="id58" name="id58">6.3.3 SIP_PYDICT</a></li>
+<li><a class="reference" href="#sip-pylist" id="id59" name="id59">6.3.4 SIP_PYLIST</a></li>
+<li><a class="reference" href="#sip-pyobject" id="id60" name="id60">6.3.5 SIP_PYOBJECT</a></li>
+<li><a class="reference" href="#sip-pyslice" id="id61" name="id61">6.3.6 SIP_PYSLICE</a></li>
+<li><a class="reference" href="#sip-pytuple" id="id62" name="id62">6.3.7 SIP_PYTUPLE</a></li>
+<li><a class="reference" href="#sip-pytype" id="id63" name="id63">6.3.8 SIP_PYTYPE</a></li>
+<li><a class="reference" href="#sip-qobject" id="id64" name="id64">6.3.9 SIP_QOBJECT</a></li>
+<li><a class="reference" href="#sip-rxobj-con" id="id65" name="id65">6.3.10 SIP_RXOBJ_CON</a></li>
+<li><a class="reference" href="#sip-rxobj-dis" id="id66" name="id66">6.3.11 SIP_RXOBJ_DIS</a></li>
+<li><a class="reference" href="#sip-signal" id="id67" name="id67">6.3.12 SIP_SIGNAL</a></li>
+<li><a class="reference" href="#sip-slot" id="id68" name="id68">6.3.13 SIP_SLOT</a></li>
+<li><a class="reference" href="#sip-slot-con" id="id69" name="id69">6.3.14 SIP_SLOT_CON</a></li>
+<li><a class="reference" href="#sip-slot-dis" id="id70" name="id70">6.3.15 SIP_SLOT_DIS</a></li>
</ul>
</li>
</ul>
</li>
-<li><a class="reference" href="#sip-directives" id="id68" name="id68">7 SIP Directives</a><ul class="auto-toc">
-<li><a class="reference" href="#accesscode" id="id69" name="id69">7.1 %AccessCode</a></li>
-<li><a class="reference" href="#bigetcharbuffercode" id="id70" name="id70">7.2 %BIGetCharBufferCode</a></li>
-<li><a class="reference" href="#bigetreadbuffercode" id="id71" name="id71">7.3 %BIGetReadBufferCode</a></li>
-<li><a class="reference" href="#bigetsegcountcode" id="id72" name="id72">7.4 %BIGetSegCountCode</a></li>
-<li><a class="reference" href="#bigetwritebuffercode" id="id73" name="id73">7.5 %BIGetWriteBufferCode</a></li>
-<li><a class="reference" href="#cmodule" id="id74" name="id74">7.6 %CModule</a></li>
-<li><a class="reference" href="#compositemodule" id="id75" name="id75">7.7 %CompositeModule</a></li>
-<li><a class="reference" href="#consolidatedmodule" id="id76" name="id76">7.8 %ConsolidatedModule</a></li>
-<li><a class="reference" href="#convertfromtypecode" id="id77" name="id77">7.9 %ConvertFromTypeCode</a></li>
-<li><a class="reference" href="#converttosubclasscode" id="id78" name="id78">7.10 %ConvertToSubClassCode</a></li>
-<li><a class="reference" href="#converttotypecode" id="id79" name="id79">7.11 %ConvertToTypeCode</a></li>
-<li><a class="reference" href="#copying" id="id80" name="id80">7.12 %Copying</a></li>
-<li><a class="reference" href="#doc" id="id81" name="id81">7.13 %Doc</a></li>
-<li><a class="reference" href="#end" id="id82" name="id82">7.14 %End</a></li>
-<li><a class="reference" href="#exception" id="id83" name="id83">7.15 %Exception</a></li>
-<li><a class="reference" href="#exporteddoc" id="id84" name="id84">7.16 %ExportedDoc</a></li>
-<li><a class="reference" href="#exportedheadercode" id="id85" name="id85">7.17 %ExportedHeaderCode</a></li>
-<li><a class="reference" href="#feature" id="id86" name="id86">7.18 %Feature</a></li>
-<li><a class="reference" href="#gcclearcode" id="id87" name="id87">7.19 %GCClearCode</a></li>
-<li><a class="reference" href="#gctraversecode" id="id88" name="id88">7.20 %GCTraverseCode</a></li>
-<li><a class="reference" href="#getcode" id="id89" name="id89">7.21 %GetCode</a></li>
-<li><a class="reference" href="#if" id="id90" name="id90">7.22 %If</a></li>
-<li><a class="reference" href="#import" id="id91" name="id91">7.23 %Import</a></li>
-<li><a class="reference" href="#include" id="id92" name="id92">7.24 %Include</a></li>
-<li><a class="reference" href="#id14" id="id93" name="id93">7.25 %License</a></li>
-<li><a class="reference" href="#mappedtype" id="id94" name="id94">7.26 %MappedType</a></li>
-<li><a class="reference" href="#methodcode" id="id95" name="id95">7.27 %MethodCode</a></li>
-<li><a class="reference" href="#module" id="id96" name="id96">7.28 %Module</a></li>
-<li><a class="reference" href="#modulecode" id="id97" name="id97">7.29 %ModuleCode</a></li>
-<li><a class="reference" href="#moduleheadercode" id="id98" name="id98">7.30 %ModuleHeaderCode</a></li>
-<li><a class="reference" href="#optionalinclude" id="id99" name="id99">7.31 %OptionalInclude</a></li>
-<li><a class="reference" href="#picklecode" id="id100" name="id100">7.32 %PickleCode</a></li>
-<li><a class="reference" href="#platforms" id="id101" name="id101">7.33 %Platforms</a></li>
-<li><a class="reference" href="#postinitialisationcode" id="id102" name="id102">7.34 %PostInitialisationCode</a></li>
-<li><a class="reference" href="#preinitialisationcode" id="id103" name="id103">7.35 %PreInitialisationCode</a></li>
-<li><a class="reference" href="#raisecode" id="id104" name="id104">7.36 %RaiseCode</a></li>
-<li><a class="reference" href="#setcode" id="id105" name="id105">7.37 %SetCode</a></li>
-<li><a class="reference" href="#sipoptions" id="id106" name="id106">7.38 %SIPOptions</a></li>
-<li><a class="reference" href="#timeline" id="id107" name="id107">7.39 %Timeline</a></li>
-<li><a class="reference" href="#typecode" id="id108" name="id108">7.40 %TypeCode</a></li>
-<li><a class="reference" href="#typeheadercode" id="id109" name="id109">7.41 %TypeHeaderCode</a></li>
-<li><a class="reference" href="#unitcode" id="id110" name="id110">7.42 %UnitCode</a></li>
-<li><a class="reference" href="#virtualcatchercode" id="id111" name="id111">7.43 %VirtualCatcherCode</a></li>
+<li><a class="reference" href="#sip-directives" id="id71" name="id71">7 SIP Directives</a><ul class="auto-toc">
+<li><a class="reference" href="#accesscode" id="id72" name="id72">7.1 %AccessCode</a></li>
+<li><a class="reference" href="#bigetcharbuffercode" id="id73" name="id73">7.2 %BIGetCharBufferCode</a></li>
+<li><a class="reference" href="#bigetreadbuffercode" id="id74" name="id74">7.3 %BIGetReadBufferCode</a></li>
+<li><a class="reference" href="#bigetsegcountcode" id="id75" name="id75">7.4 %BIGetSegCountCode</a></li>
+<li><a class="reference" href="#bigetwritebuffercode" id="id76" name="id76">7.5 %BIGetWriteBufferCode</a></li>
+<li><a class="reference" href="#cmodule" id="id77" name="id77">7.6 %CModule</a></li>
+<li><a class="reference" href="#compositemodule" id="id78" name="id78">7.7 %CompositeModule</a></li>
+<li><a class="reference" href="#consolidatedmodule" id="id79" name="id79">7.8 %ConsolidatedModule</a></li>
+<li><a class="reference" href="#convertfromtypecode" id="id80" name="id80">7.9 %ConvertFromTypeCode</a></li>
+<li><a class="reference" href="#converttosubclasscode" id="id81" name="id81">7.10 %ConvertToSubClassCode</a></li>
+<li><a class="reference" href="#converttotypecode" id="id82" name="id82">7.11 %ConvertToTypeCode</a></li>
+<li><a class="reference" href="#copying" id="id83" name="id83">7.12 %Copying</a></li>
+<li><a class="reference" href="#defaultmetatype" id="id84" name="id84">7.13 %DefaultMetatype</a></li>
+<li><a class="reference" href="#defaultsupertype" id="id85" name="id85">7.14 %DefaultSupertype</a></li>
+<li><a class="reference" href="#doc" id="id86" name="id86">7.15 %Doc</a></li>
+<li><a class="reference" href="#end" id="id87" name="id87">7.16 %End</a></li>
+<li><a class="reference" href="#exception" id="id88" name="id88">7.17 %Exception</a></li>
+<li><a class="reference" href="#exporteddoc" id="id89" name="id89">7.18 %ExportedDoc</a></li>
+<li><a class="reference" href="#exportedheadercode" id="id90" name="id90">7.19 %ExportedHeaderCode</a></li>
+<li><a class="reference" href="#feature" id="id91" name="id91">7.20 %Feature</a></li>
+<li><a class="reference" href="#gcclearcode" id="id92" name="id92">7.21 %GCClearCode</a></li>
+<li><a class="reference" href="#gctraversecode" id="id93" name="id93">7.22 %GCTraverseCode</a></li>
+<li><a class="reference" href="#getcode" id="id94" name="id94">7.23 %GetCode</a></li>
+<li><a class="reference" href="#if" id="id95" name="id95">7.24 %If</a></li>
+<li><a class="reference" href="#import" id="id96" name="id96">7.25 %Import</a></li>
+<li><a class="reference" href="#include" id="id97" name="id97">7.26 %Include</a></li>
+<li><a class="reference" href="#initialisationcode" id="id98" name="id98">7.27 %InitialisationCode</a></li>
+<li><a class="reference" href="#id14" id="id99" name="id99">7.28 %License</a></li>
+<li><a class="reference" href="#mappedtype" id="id100" name="id100">7.29 %MappedType</a></li>
+<li><a class="reference" href="#methodcode" id="id101" name="id101">7.30 %MethodCode</a></li>
+<li><a class="reference" href="#module" id="id102" name="id102">7.31 %Module</a></li>
+<li><a class="reference" href="#modulecode" id="id103" name="id103">7.32 %ModuleCode</a></li>
+<li><a class="reference" href="#moduleheadercode" id="id104" name="id104">7.33 %ModuleHeaderCode</a></li>
+<li><a class="reference" href="#optionalinclude" id="id105" name="id105">7.34 %OptionalInclude</a></li>
+<li><a class="reference" href="#picklecode" id="id106" name="id106">7.35 %PickleCode</a></li>
+<li><a class="reference" href="#platforms" id="id107" name="id107">7.36 %Platforms</a></li>
+<li><a class="reference" href="#postinitialisationcode" id="id108" name="id108">7.37 %PostInitialisationCode</a></li>
+<li><a class="reference" href="#preinitialisationcode" id="id109" name="id109">7.38 %PreInitialisationCode</a></li>
+<li><a class="reference" href="#raisecode" id="id110" name="id110">7.39 %RaiseCode</a></li>
+<li><a class="reference" href="#setcode" id="id111" name="id111">7.40 %SetCode</a></li>
+<li><a class="reference" href="#timeline" id="id112" name="id112">7.41 %Timeline</a></li>
+<li><a class="reference" href="#typecode" id="id113" name="id113">7.42 %TypeCode</a></li>
+<li><a class="reference" href="#typeheadercode" id="id114" name="id114">7.43 %TypeHeaderCode</a></li>
+<li><a class="reference" href="#unitcode" id="id115" name="id115">7.44 %UnitCode</a></li>
+<li><a class="reference" href="#virtualcatchercode" id="id116" name="id116">7.45 %VirtualCatcherCode</a></li>
</ul>
</li>
-<li><a class="reference" href="#sip-annotations" id="id112" name="id112">8 SIP Annotations</a><ul class="auto-toc">
-<li><a class="reference" href="#argument-annotations" id="id113" name="id113">8.1 Argument Annotations</a><ul class="auto-toc">
-<li><a class="reference" href="#allownone" id="id114" name="id114">8.1.1 AllowNone</a></li>
-<li><a class="reference" href="#array" id="id115" name="id115">8.1.2 Array</a></li>
-<li><a class="reference" href="#arraysize" id="id116" name="id116">8.1.3 ArraySize</a></li>
-<li><a class="reference" href="#constrained" id="id117" name="id117">8.1.4 Constrained</a></li>
-<li><a class="reference" href="#getwrapper" id="id118" name="id118">8.1.5 GetWrapper</a></li>
-<li><a class="reference" href="#in" id="id119" name="id119">8.1.6 In</a></li>
-<li><a class="reference" href="#out" id="id120" name="id120">8.1.7 Out</a></li>
-<li><a class="reference" href="#resultsize" id="id121" name="id121">8.1.8 ResultSize</a></li>
-<li><a class="reference" href="#singleshot" id="id122" name="id122">8.1.9 SingleShot</a></li>
-<li><a class="reference" href="#transfer" id="id123" name="id123">8.1.10 Transfer</a></li>
-<li><a class="reference" href="#transferback" id="id124" name="id124">8.1.11 TransferBack</a></li>
-<li><a class="reference" href="#transferthis" id="id125" name="id125">8.1.12 TransferThis</a></li>
+<li><a class="reference" href="#sip-annotations" id="id117" name="id117">8 SIP Annotations</a><ul class="auto-toc">
+<li><a class="reference" href="#argument-annotations" id="id118" name="id118">8.1 Argument Annotations</a><ul class="auto-toc">
+<li><a class="reference" href="#allownone" id="id119" name="id119">8.1.1 AllowNone</a></li>
+<li><a class="reference" href="#array" id="id120" name="id120">8.1.2 Array</a></li>
+<li><a class="reference" href="#arraysize" id="id121" name="id121">8.1.3 ArraySize</a></li>
+<li><a class="reference" href="#constrained" id="id122" name="id122">8.1.4 Constrained</a></li>
+<li><a class="reference" href="#getwrapper" id="id123" name="id123">8.1.5 GetWrapper</a></li>
+<li><a class="reference" href="#in" id="id124" name="id124">8.1.6 In</a></li>
+<li><a class="reference" href="#out" id="id125" name="id125">8.1.7 Out</a></li>
+<li><a class="reference" href="#resultsize" id="id126" name="id126">8.1.8 ResultSize</a></li>
+<li><a class="reference" href="#singleshot" id="id127" name="id127">8.1.9 SingleShot</a></li>
+<li><a class="reference" href="#transfer" id="id128" name="id128">8.1.10 Transfer</a></li>
+<li><a class="reference" href="#transferback" id="id129" name="id129">8.1.11 TransferBack</a></li>
+<li><a class="reference" href="#transferthis" id="id130" name="id130">8.1.12 TransferThis</a></li>
</ul>
</li>
-<li><a class="reference" href="#class-annotations" id="id126" name="id126">8.2 Class Annotations</a><ul class="auto-toc">
-<li><a class="reference" href="#abstract" id="id127" name="id127">8.2.1 Abstract</a></li>
-<li><a class="reference" href="#delaydtor" id="id128" name="id128">8.2.2 DelayDtor</a></li>
-<li><a class="reference" href="#deprecated" id="id129" name="id129">8.2.3 Deprecated</a></li>
-<li><a class="reference" href="#external" id="id130" name="id130">8.2.4 External</a></li>
-<li><a class="reference" href="#nodefaultctors" id="id131" name="id131">8.2.5 NoDefaultCtors</a></li>
-<li><a class="reference" href="#pyname" id="id132" name="id132">8.2.6 PyName</a></li>
+<li><a class="reference" href="#class-annotations" id="id131" name="id131">8.2 Class Annotations</a><ul class="auto-toc">
+<li><a class="reference" href="#abstract" id="id132" name="id132">8.2.1 Abstract</a></li>
+<li><a class="reference" href="#delaydtor" id="id133" name="id133">8.2.2 DelayDtor</a></li>
+<li><a class="reference" href="#deprecated" id="id134" name="id134">8.2.3 Deprecated</a></li>
+<li><a class="reference" href="#external" id="id135" name="id135">8.2.4 External</a></li>
+<li><a class="reference" href="#metatype" id="id136" name="id136">8.2.5 Metatype</a></li>
+<li><a class="reference" href="#nodefaultctors" id="id137" name="id137">8.2.6 NoDefaultCtors</a></li>
+<li><a class="reference" href="#pyname" id="id138" name="id138">8.2.7 PyName</a></li>
+<li><a class="reference" href="#supertype" id="id139" name="id139">8.2.8 Supertype</a></li>
</ul>
</li>
-<li><a class="reference" href="#mapped-type-annotations" id="id133" name="id133">8.3 Mapped Type Annotations</a><ul class="auto-toc">
-<li><a class="reference" href="#norelease" id="id134" name="id134">8.3.1 NoRelease</a></li>
+<li><a class="reference" href="#mapped-type-annotations" id="id140" name="id140">8.3 Mapped Type Annotations</a><ul class="auto-toc">
+<li><a class="reference" href="#norelease" id="id141" name="id141">8.3.1 NoRelease</a></li>
</ul>
</li>
-<li><a class="reference" href="#enum-annotations" id="id135" name="id135">8.4 Enum Annotations</a><ul class="auto-toc">
-<li><a class="reference" href="#id17" id="id136" name="id136">8.4.1 PyName</a></li>
+<li><a class="reference" href="#enum-annotations" id="id142" name="id142">8.4 Enum Annotations</a><ul class="auto-toc">
+<li><a class="reference" href="#id17" id="id143" name="id143">8.4.1 PyName</a></li>
</ul>
</li>
-<li><a class="reference" href="#exception-annotations" id="id137" name="id137">8.5 Exception Annotations</a><ul class="auto-toc">
-<li><a class="reference" href="#id18" id="id138" name="id138">8.5.1 PyName</a></li>
+<li><a class="reference" href="#exception-annotations" id="id144" name="id144">8.5 Exception Annotations</a><ul class="auto-toc">
+<li><a class="reference" href="#id18" id="id145" name="id145">8.5.1 PyName</a></li>
</ul>
</li>
-<li><a class="reference" href="#function-annotations" id="id139" name="id139">8.6 Function Annotations</a><ul class="auto-toc">
-<li><a class="reference" href="#autogen" id="id140" name="id140">8.6.1 AutoGen</a></li>
-<li><a class="reference" href="#default" id="id141" name="id141">8.6.2 Default</a></li>
-<li><a class="reference" href="#id19" id="id142" name="id142">8.6.3 Deprecated</a></li>
-<li><a class="reference" href="#factory" id="id143" name="id143">8.6.4 Factory</a></li>
-<li><a class="reference" href="#holdgil" id="id144" name="id144">8.6.5 HoldGIL</a></li>
-<li><a class="reference" href="#newthread" id="id145" name="id145">8.6.6 NewThread</a></li>
-<li><a class="reference" href="#noargparser" id="id146" name="id146">8.6.7 NoArgParser</a></li>
-<li><a class="reference" href="#noderived" id="id147" name="id147">8.6.8 NoDerived</a></li>
-<li><a class="reference" href="#numeric" id="id148" name="id148">8.6.9 Numeric</a></li>
-<li><a class="reference" href="#posthook" id="id149" name="id149">8.6.10 PostHook</a></li>
-<li><a class="reference" href="#prehook" id="id150" name="id150">8.6.11 PreHook</a></li>
-<li><a class="reference" href="#id20" id="id151" name="id151">8.6.12 PyName</a></li>
-<li><a class="reference" href="#releasegil" id="id152" name="id152">8.6.13 ReleaseGIL</a></li>
-<li><a class="reference" href="#id21" id="id153" name="id153">8.6.14 Transfer</a></li>
-<li><a class="reference" href="#id22" id="id154" name="id154">8.6.15 TransferBack</a></li>
-<li><a class="reference" href="#id23" id="id155" name="id155">8.6.16 TransferThis</a></li>
+<li><a class="reference" href="#function-annotations" id="id146" name="id146">8.6 Function Annotations</a><ul class="auto-toc">
+<li><a class="reference" href="#autogen" id="id147" name="id147">8.6.1 AutoGen</a></li>
+<li><a class="reference" href="#default" id="id148" name="id148">8.6.2 Default</a></li>
+<li><a class="reference" href="#id19" id="id149" name="id149">8.6.3 Deprecated</a></li>
+<li><a class="reference" href="#factory" id="id150" name="id150">8.6.4 Factory</a></li>
+<li><a class="reference" href="#holdgil" id="id151" name="id151">8.6.5 HoldGIL</a></li>
+<li><a class="reference" href="#newthread" id="id152" name="id152">8.6.6 NewThread</a></li>
+<li><a class="reference" href="#noargparser" id="id153" name="id153">8.6.7 NoArgParser</a></li>
+<li><a class="reference" href="#noderived" id="id154" name="id154">8.6.8 NoDerived</a></li>
+<li><a class="reference" href="#numeric" id="id155" name="id155">8.6.9 Numeric</a></li>
+<li><a class="reference" href="#posthook" id="id156" name="id156">8.6.10 PostHook</a></li>
+<li><a class="reference" href="#prehook" id="id157" name="id157">8.6.11 PreHook</a></li>
+<li><a class="reference" href="#id20" id="id158" name="id158">8.6.12 PyName</a></li>
+<li><a class="reference" href="#releasegil" id="id159" name="id159">8.6.13 ReleaseGIL</a></li>
+<li><a class="reference" href="#id21" id="id160" name="id160">8.6.14 Transfer</a></li>
+<li><a class="reference" href="#id22" id="id161" name="id161">8.6.15 TransferBack</a></li>
+<li><a class="reference" href="#id23" id="id162" name="id162">8.6.16 TransferThis</a></li>
</ul>
</li>
-<li><a class="reference" href="#license-annotations" id="id156" name="id156">8.7 License Annotations</a><ul class="auto-toc">
-<li><a class="reference" href="#licensee" id="id157" name="id157">8.7.1 Licensee</a></li>
-<li><a class="reference" href="#signature" id="id158" name="id158">8.7.2 Signature</a></li>
-<li><a class="reference" href="#timestamp" id="id159" name="id159">8.7.3 Timestamp</a></li>
-<li><a class="reference" href="#type" id="id160" name="id160">8.7.4 Type</a></li>
+<li><a class="reference" href="#license-annotations" id="id163" name="id163">8.7 License Annotations</a><ul class="auto-toc">
+<li><a class="reference" href="#licensee" id="id164" name="id164">8.7.1 Licensee</a></li>
+<li><a class="reference" href="#signature" id="id165" name="id165">8.7.2 Signature</a></li>
+<li><a class="reference" href="#timestamp" id="id166" name="id166">8.7.3 Timestamp</a></li>
+<li><a class="reference" href="#type" id="id167" name="id167">8.7.4 Type</a></li>
</ul>
</li>
-<li><a class="reference" href="#typedef-annotations" id="id161" name="id161">8.8 Typedef Annotations</a><ul class="auto-toc">
-<li><a class="reference" href="#notypename" id="id162" name="id162">8.8.1 NoTypeName</a></li>
+<li><a class="reference" href="#typedef-annotations" id="id168" name="id168">8.8 Typedef Annotations</a><ul class="auto-toc">
+<li><a class="reference" href="#notypename" id="id169" name="id169">8.8.1 NoTypeName</a></li>
</ul>
</li>
-<li><a class="reference" href="#variable-annotations" id="id163" name="id163">8.9 Variable Annotations</a><ul class="auto-toc">
-<li><a class="reference" href="#id24" id="id164" name="id164">8.9.1 PyName</a></li>
+<li><a class="reference" href="#variable-annotations" id="id170" name="id170">8.9 Variable Annotations</a><ul class="auto-toc">
+<li><a class="reference" href="#id24" id="id171" name="id171">8.9.1 PyName</a></li>
</ul>
</li>
</ul>
</li>
-<li><a class="reference" href="#sip-api-for-handwritten-code" id="id165" name="id165">9 SIP API for Handwritten Code</a><ul class="auto-toc">
-<li><a class="reference" href="#sip-api-major-nr" id="id166" name="id166">9.1 SIP_API_MAJOR_NR</a></li>
-<li><a class="reference" href="#sip-api-minor-nr" id="id167" name="id167">9.2 SIP_API_MINOR_NR</a></li>
-<li><a class="reference" href="#sip-block-threads" id="id168" name="id168">9.3 SIP_BLOCK_THREADS</a></li>
-<li><a class="reference" href="#sip-ssize-t" id="id169" name="id169">9.4 SIP_SSIZE_T</a></li>
-<li><a class="reference" href="#sip-unblock-threads" id="id170" name="id170">9.5 SIP_UNBLOCK_THREADS</a></li>
-<li><a class="reference" href="#sip-version" id="id171" name="id171">9.6 SIP_VERSION</a></li>
-<li><a class="reference" href="#sip-version-str" id="id172" name="id172">9.7 SIP_VERSION_STR</a></li>
-<li><a class="reference" href="#sipbadcatcherresult" id="id173" name="id173">9.8 sipBadCatcherResult()</a></li>
-<li><a class="reference" href="#sipbadlengthforslice" id="id174" name="id174">9.9 sipBadLengthForSlice()</a></li>
-<li><a class="reference" href="#sipbuildresult" id="id175" name="id175">9.10 sipBuildResult()</a></li>
-<li><a class="reference" href="#sipcallmethod" id="id176" name="id176">9.11 sipCallMethod()</a></li>
-<li><a class="reference" href="#sipcanconverttoinstance" id="id177" name="id177">9.12 sipCanConvertToInstance()</a></li>
-<li><a class="reference" href="#sipcanconverttomappedtype" id="id178" name="id178">9.13 sipCanConvertToMappedType()</a></li>
-<li><a class="reference" href="#sipclassname" id="id179" name="id179">9.14 sipClassName()</a></li>
-<li><a class="reference" href="#sipconnectrx" id="id180" name="id180">9.15 sipConnectRx()</a></li>
-<li><a class="reference" href="#sipconvertfromconstvoidptr" id="id181" name="id181">9.16 sipConvertFromConstVoidPtr()</a></li>
-<li><a class="reference" href="#sipconvertfromconstvoidptrandsize" id="id182" name="id182">9.17 sipConvertFromConstVoidPtrAndSize()</a></li>
-<li><a class="reference" href="#sipconvertfrominstance" id="id183" name="id183">9.18 sipConvertFromInstance()</a></li>
-<li><a class="reference" href="#sipconvertfrommappedtype" id="id184" name="id184">9.19 sipConvertFromMappedType()</a></li>
-<li><a class="reference" href="#sipconvertfromnamedenum" id="id185" name="id185">9.20 sipConvertFromNamedEnum()</a></li>
-<li><a class="reference" href="#sipconvertfromnewinstance" id="id186" name="id186">9.21 sipConvertFromNewInstance()</a></li>
-<li><a class="reference" href="#sipconvertfromsequenceindex" id="id187" name="id187">9.22 sipConvertFromSequenceIndex()</a></li>
-<li><a class="reference" href="#sipconvertfromsliceobject" id="id188" name="id188">9.23 sipConvertFromSliceObject()</a></li>
-<li><a class="reference" href="#sipconvertfromvoidptr" id="id189" name="id189">9.24 sipConvertFromVoidPtr()</a></li>
-<li><a class="reference" href="#sipconvertfromvoidptrandsize" id="id190" name="id190">9.25 sipConvertFromVoidPtrAndSize()</a></li>
-<li><a class="reference" href="#sipconverttocpp" id="id191" name="id191">9.26 sipConvertToCpp()</a></li>
-<li><a class="reference" href="#sipconverttoinstance" id="id192" name="id192">9.27 sipConvertToInstance()</a></li>
-<li><a class="reference" href="#sipconverttomappedtype" id="id193" name="id193">9.28 sipConvertToMappedType()</a></li>
-<li><a class="reference" href="#sipconverttovoidptr" id="id194" name="id194">9.29 sipConvertToVoidPtr()</a></li>
-<li><a class="reference" href="#sipdisconnectrx" id="id195" name="id195">9.30 sipDisconnectRx()</a></li>
-<li><a class="reference" href="#sipemitsignal" id="id196" name="id196">9.31 sipEmitSignal()</a></li>
-<li><a class="reference" href="#sipexportsymbol" id="id197" name="id197">9.32 sipExportSymbol()</a></li>
-<li><a class="reference" href="#sipfindclass" id="id198" name="id198">9.33 sipFindClass()</a></li>
-<li><a class="reference" href="#sipfindmappedtype" id="id199" name="id199">9.34 sipFindMappedType()</a></li>
-<li><a class="reference" href="#sipfindnamedenum" id="id200" name="id200">9.35 sipFindNamedEnum()</a></li>
-<li><a class="reference" href="#sipforceconverttoinstance" id="id201" name="id201">9.36 sipForceConvertToInstance()</a></li>
-<li><a class="reference" href="#sipforceconverttomappedtype" id="id202" name="id202">9.37 sipForceConvertToMappedType()</a></li>
-<li><a class="reference" href="#sipfree" id="id203" name="id203">9.38 sipFree()</a></li>
-<li><a class="reference" href="#sipgetsender" id="id204" name="id204">9.39 sipGetSender()</a></li>
-<li><a class="reference" href="#sipgetwrapper" id="id205" name="id205">9.40 sipGetWrapper()</a></li>
-<li><a class="reference" href="#sipimportsymbol" id="id206" name="id206">9.41 sipImportSymbol()</a></li>
-<li><a class="reference" href="#sipinttypeclassmap" id="id207" name="id207">9.42 sipIntTypeClassMap</a></li>
-<li><a class="reference" href="#sipissubclassinstance" id="id208" name="id208">9.43 sipIsSubClassInstance()</a></li>
-<li><a class="reference" href="#siplong-asunsignedlong" id="id209" name="id209">9.44 sipLong_AsUnsignedLong()</a></li>
-<li><a class="reference" href="#sipmalloc" id="id210" name="id210">9.45 sipMalloc()</a></li>
-<li><a class="reference" href="#sipmapinttoclass" id="id211" name="id211">9.46 sipMapIntToClass()</a></li>
-<li><a class="reference" href="#sipmapstringtoclass" id="id212" name="id212">9.47 sipMapStringToClass()</a></li>
-<li><a class="reference" href="#sipparseresult" id="id213" name="id213">9.48 sipParseResult()</a></li>
-<li><a class="reference" href="#sipreleaseinstance" id="id214" name="id214">9.49 sipReleaseInstance()</a></li>
-<li><a class="reference" href="#sipreleasemappedtype" id="id215" name="id215">9.50 sipReleaseMappedType()</a></li>
-<li><a class="reference" href="#sipstringtypeclassmap" id="id216" name="id216">9.51 sipStringTypeClassMap</a></li>
-<li><a class="reference" href="#siptransfer" id="id217" name="id217">9.52 sipTransfer()</a></li>
-<li><a class="reference" href="#siptransferback" id="id218" name="id218">9.53 sipTransferBack()</a></li>
-<li><a class="reference" href="#siptransferbreak" id="id219" name="id219">9.54 sipTransferBreak()</a></li>
-<li><a class="reference" href="#siptransferto" id="id220" name="id220">9.55 sipTransferTo()</a></li>
-<li><a class="reference" href="#sipwrapper" id="id221" name="id221">9.56 sipWrapper</a></li>
-<li><a class="reference" href="#sipwrapper-check" id="id222" name="id222">9.57 sipWrapper_Check()</a></li>
-<li><a class="reference" href="#sipwrappertype" id="id223" name="id223">9.58 sipWrapperType</a></li>
-<li><a class="reference" href="#generated-type-convertors" id="id224" name="id224">9.59 Generated Type Convertors</a></li>
-<li><a class="reference" href="#generated-type-objects" id="id225" name="id225">9.60 Generated Type Objects</a></li>
-<li><a class="reference" href="#generated-named-enum-type-objects" id="id226" name="id226">9.61 Generated Named Enum Type Objects</a></li>
-<li><a class="reference" href="#generated-derived-classes" id="id227" name="id227">9.62 Generated Derived Classes</a></li>
-<li><a class="reference" href="#generated-exception-objects" id="id228" name="id228">9.63 Generated Exception Objects</a></li>
+<li><a class="reference" href="#sip-api-for-handwritten-code" id="id172" name="id172">9 SIP API for Handwritten Code</a><ul class="auto-toc">
+<li><a class="reference" href="#sip-api-major-nr" id="id173" name="id173">9.1 SIP_API_MAJOR_NR</a></li>
+<li><a class="reference" href="#sip-api-minor-nr" id="id174" name="id174">9.2 SIP_API_MINOR_NR</a></li>
+<li><a class="reference" href="#sip-block-threads" id="id175" name="id175">9.3 SIP_BLOCK_THREADS</a></li>
+<li><a class="reference" href="#sip-ssize-t" id="id176" name="id176">9.4 SIP_SSIZE_T</a></li>
+<li><a class="reference" href="#sip-unblock-threads" id="id177" name="id177">9.5 SIP_UNBLOCK_THREADS</a></li>
+<li><a class="reference" href="#sip-version" id="id178" name="id178">9.6 SIP_VERSION</a></li>
+<li><a class="reference" href="#sip-version-str" id="id179" name="id179">9.7 SIP_VERSION_STR</a></li>
+<li><a class="reference" href="#sipbadcatcherresult" id="id180" name="id180">9.8 sipBadCatcherResult()</a></li>
+<li><a class="reference" href="#sipbadlengthforslice" id="id181" name="id181">9.9 sipBadLengthForSlice()</a></li>
+<li><a class="reference" href="#sipbuildresult" id="id182" name="id182">9.10 sipBuildResult()</a></li>
+<li><a class="reference" href="#sipcallmethod" id="id183" name="id183">9.11 sipCallMethod()</a></li>
+<li><a class="reference" href="#sipcanconverttoinstance" id="id184" name="id184">9.12 sipCanConvertToInstance()</a></li>
+<li><a class="reference" href="#sipcanconverttomappedtype" id="id185" name="id185">9.13 sipCanConvertToMappedType()</a></li>
+<li><a class="reference" href="#sipcanconverttotype" id="id186" name="id186">9.14 sipCanConvertToType()</a></li>
+<li><a class="reference" href="#sipclassname" id="id187" name="id187">9.15 sipClassName()</a></li>
+<li><a class="reference" href="#sipconvertfromconstvoidptr" id="id188" name="id188">9.16 sipConvertFromConstVoidPtr()</a></li>
+<li><a class="reference" href="#sipconvertfromconstvoidptrandsize" id="id189" name="id189">9.17 sipConvertFromConstVoidPtrAndSize()</a></li>
+<li><a class="reference" href="#sipconvertfromenum" id="id190" name="id190">9.18 sipConvertFromEnum()</a></li>
+<li><a class="reference" href="#sipconvertfrominstance" id="id191" name="id191">9.19 sipConvertFromInstance()</a></li>
+<li><a class="reference" href="#sipconvertfrommappedtype" id="id192" name="id192">9.20 sipConvertFromMappedType()</a></li>
+<li><a class="reference" href="#sipconvertfromnamedenum" id="id193" name="id193">9.21 sipConvertFromNamedEnum()</a></li>
+<li><a class="reference" href="#sipconvertfromnewinstance" id="id194" name="id194">9.22 sipConvertFromNewInstance()</a></li>
+<li><a class="reference" href="#sipconvertfromnewtype" id="id195" name="id195">9.23 sipConvertFromNewType()</a></li>
+<li><a class="reference" href="#sipconvertfromsequenceindex" id="id196" name="id196">9.24 sipConvertFromSequenceIndex()</a></li>
+<li><a class="reference" href="#sipconvertfromsliceobject" id="id197" name="id197">9.25 sipConvertFromSliceObject()</a></li>
+<li><a class="reference" href="#sipconvertfromtype" id="id198" name="id198">9.26 sipConvertFromType()</a></li>
+<li><a class="reference" href="#sipconvertfromvoidptr" id="id199" name="id199">9.27 sipConvertFromVoidPtr()</a></li>
+<li><a class="reference" href="#sipconvertfromvoidptrandsize" id="id200" name="id200">9.28 sipConvertFromVoidPtrAndSize()</a></li>
+<li><a class="reference" href="#sipconverttoinstance" id="id201" name="id201">9.29 sipConvertToInstance()</a></li>
+<li><a class="reference" href="#sipconverttomappedtype" id="id202" name="id202">9.30 sipConvertToMappedType()</a></li>
+<li><a class="reference" href="#sipconverttotype" id="id203" name="id203">9.31 sipConvertToType()</a></li>
+<li><a class="reference" href="#sipconverttovoidptr" id="id204" name="id204">9.32 sipConvertToVoidPtr()</a></li>
+<li><a class="reference" href="#sipexportsymbol" id="id205" name="id205">9.33 sipExportSymbol()</a></li>
+<li><a class="reference" href="#sipfindclass" id="id206" name="id206">9.34 sipFindClass()</a></li>
+<li><a class="reference" href="#sipfindmappedtype" id="id207" name="id207">9.35 sipFindMappedType()</a></li>
+<li><a class="reference" href="#sipfindnamedenum" id="id208" name="id208">9.36 sipFindNamedEnum()</a></li>
+<li><a class="reference" href="#sipfindtype" id="id209" name="id209">9.37 sipFindType()</a></li>
+<li><a class="reference" href="#sipforceconverttoinstance" id="id210" name="id210">9.38 sipForceConvertToInstance()</a></li>
+<li><a class="reference" href="#sipforceconverttomappedtype" id="id211" name="id211">9.39 sipForceConvertToMappedType()</a></li>
+<li><a class="reference" href="#sipforceconverttotype" id="id212" name="id212">9.40 sipForceConvertToType()</a></li>
+<li><a class="reference" href="#sipfree" id="id213" name="id213">9.41 sipFree()</a></li>
+<li><a class="reference" href="#sipgetpyobject" id="id214" name="id214">9.42 sipGetPyObject()</a></li>
+<li><a class="reference" href="#sipgetwrapper" id="id215" name="id215">9.43 sipGetWrapper()</a></li>
+<li><a class="reference" href="#sipimportsymbol" id="id216" name="id216">9.44 sipImportSymbol()</a></li>
+<li><a class="reference" href="#sipinttypeclassmap" id="id217" name="id217">9.45 sipIntTypeClassMap</a></li>
+<li><a class="reference" href="#siplong-asunsignedlong" id="id218" name="id218">9.46 sipLong_AsUnsignedLong()</a></li>
+<li><a class="reference" href="#sipmalloc" id="id219" name="id219">9.47 sipMalloc()</a></li>
+<li><a class="reference" href="#sipmapinttoclass" id="id220" name="id220">9.48 sipMapIntToClass()</a></li>
+<li><a class="reference" href="#sipmapstringtoclass" id="id221" name="id221">9.49 sipMapStringToClass()</a></li>
+<li><a class="reference" href="#sipparseresult" id="id222" name="id222">9.50 sipParseResult()</a></li>
+<li><a class="reference" href="#sipregisterattributegetter" id="id223" name="id223">9.51 sipRegisterAttributeGetter()</a></li>
+<li><a class="reference" href="#sipregisterpytype" id="id224" name="id224">9.52 sipRegisterPyType()</a></li>
+<li><a class="reference" href="#sipreleaseinstance" id="id225" name="id225">9.53 sipReleaseInstance()</a></li>
+<li><a class="reference" href="#sipreleasemappedtype" id="id226" name="id226">9.54 sipReleaseMappedType()</a></li>
+<li><a class="reference" href="#sipreleasetype" id="id227" name="id227">9.55 sipReleaseType()</a></li>
+<li><a class="reference" href="#sipresolvetypedef" id="id228" name="id228">9.56 sipResolveTypedef()</a></li>
+<li><a class="reference" href="#sipsimplewrapper" id="id229" name="id229">9.57 sipSimpleWrapper</a></li>
+<li><a class="reference" href="#sipsimplewrapper-type" id="id230" name="id230">9.58 sipSimpleWrapper_Type</a></li>
+<li><a class="reference" href="#sipstringtypeclassmap" id="id231" name="id231">9.59 sipStringTypeClassMap</a></li>
+<li><a class="reference" href="#siptransferback" id="id232" name="id232">9.60 sipTransferBack()</a></li>
+<li><a class="reference" href="#siptransferbreak" id="id233" name="id233">9.61 sipTransferBreak()</a></li>
+<li><a class="reference" href="#siptransferto" id="id234" name="id234">9.62 sipTransferTo()</a></li>
+<li><a class="reference" href="#siptypeaspytypeobject" id="id235" name="id235">9.63 sipTypeAsPyTypeObject()</a></li>
+<li><a class="reference" href="#siptypefrompytypeobject" id="id236" name="id236">9.64 sipTypeFromPyTypeObject()</a></li>
+<li><a class="reference" href="#siptypeisclass" id="id237" name="id237">9.65 sipTypeIsClass()</a></li>
+<li><a class="reference" href="#siptypeisenum" id="id238" name="id238">9.66 sipTypeIsEnum()</a></li>
+<li><a class="reference" href="#siptypeismapped" id="id239" name="id239">9.67 sipTypeIsMapped()</a></li>
+<li><a class="reference" href="#siptypeisnamespace" id="id240" name="id240">9.68 sipTypeIsNamespace()</a></li>
+<li><a class="reference" href="#siptypename" id="id241" name="id241">9.69 sipTypeName()</a></li>
+<li><a class="reference" href="#siptypescope" id="id242" name="id242">9.70 sipTypeScope()</a></li>
+<li><a class="reference" href="#sipvoidptr-type" id="id243" name="id243">9.71 sipVoidPtr_Type</a></li>
+<li><a class="reference" href="#sipwrapper" id="id244" name="id244">9.72 sipWrapper</a></li>
+<li><a class="reference" href="#sipwrapper-check" id="id245" name="id245">9.73 sipWrapper_Check()</a></li>
+<li><a class="reference" href="#sipwrapper-type" id="id246" name="id246">9.74 sipWrapper_Type</a></li>
+<li><a class="reference" href="#sipwrappertype" id="id247" name="id247">9.75 sipWrapperType</a></li>
+<li><a class="reference" href="#sipwrappertype-type" id="id248" name="id248">9.76 sipWrapperType_Type</a></li>
+<li><a class="reference" href="#generated-type-structures" id="id249" name="id249">9.77 Generated Type Structures</a></li>
+<li><a class="reference" href="#generated-type-objects" id="id250" name="id250">9.78 Generated Type Objects</a></li>
+<li><a class="reference" href="#generated-named-enum-type-objects" id="id251" name="id251">9.79 Generated Named Enum Type Objects</a></li>
+<li><a class="reference" href="#generated-derived-classes" id="id252" name="id252">9.80 Generated Derived Classes</a></li>
+<li><a class="reference" href="#generated-exception-objects" id="id253" name="id253">9.81 Generated Exception Objects</a></li>
</ul>
</li>
-<li><a class="reference" href="#using-the-sip-api-when-embedding" id="id229" name="id229">10 Using the SIP API when Embedding</a></li>
-<li><a class="reference" href="#using-the-sip-module-in-applications" id="id230" name="id230">11 Using the SIP Module in Applications</a></li>
-<li><a class="reference" href="#the-sip-build-system" id="id231" name="id231">12 The SIP Build System</a><ul class="auto-toc">
-<li><a class="reference" href="#sipconfig-functions" id="id232" name="id232">12.1 <tt class="docutils literal"><span class="pre">sipconfig</span></tt> Functions</a></li>
-<li><a class="reference" href="#sipconfig-classes" id="id233" name="id233">12.2 <tt class="docutils literal"><span class="pre">sipconfig</span></tt> Classes</a></li>
+<li><a class="reference" href="#using-the-sip-api-when-embedding" id="id254" name="id254">10 Using the SIP API when Embedding</a></li>
+<li><a class="reference" href="#using-the-sip-module-in-applications" id="id255" name="id255">11 Using the SIP Module in Applications</a></li>
+<li><a class="reference" href="#the-sip-build-system" id="id256" name="id256">12 The SIP Build System</a><ul class="auto-toc">
+<li><a class="reference" href="#sipconfig-functions" id="id257" name="id257">12.1 <tt class="docutils literal"><span class="pre">sipconfig</span></tt> Functions</a></li>
+<li><a class="reference" href="#sipconfig-classes" id="id258" name="id258">12.2 <tt class="docutils literal"><span class="pre">sipconfig</span></tt> Classes</a></li>
</ul>
</li>
-<li><a class="reference" href="#building-your-extension-with-distutils" id="id234" name="id234">13 Building Your Extension with distutils</a></li>
-<li><a class="reference" href="#builtin-modules-and-custom-interpreters" id="id235" name="id235">14 Builtin Modules and Custom Interpreters</a></li>
+<li><a class="reference" href="#building-your-extension-with-distutils" id="id259" name="id259">13 Building Your Extension with distutils</a></li>
+<li><a class="reference" href="#builtin-modules-and-custom-interpreters" id="id260" name="id260">14 Builtin Modules and Custom Interpreters</a></li>
</ul>
</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.7.8-snapshot-20081102. SIP is a tool for
+<p>This is the reference guide for SIP 4.8-snapshot-20090225. 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
@@ -613,6 +638,8 @@ data types that are automatically invoked</li>
<li>the ability to automatically exploit any available run time type
information to ensure that the class of a Python instance object matches
the class of the corresponding C++ instance</li>
+<li>the ability to change the type and meta-type of the Python object used to
+wrap a C/C++ data type</li>
<li>full support of the Python global interpreter lock, including the ability
to specify that a C++ function of method may block, therefore allowing
the lock to be released and other Python threads to run</li>
@@ -685,7 +712,76 @@ new Python signals, and allows any Python callable object to be used as a slot.<
<div class="section">
<h1><a class="toc-backref" href="#id30" id="potential-incompatibilities-with-earlier-versions" name="potential-incompatibilities-with-earlier-versions">2 Potential Incompatibilities with Earlier Versions</a></h1>
<div class="section">
-<h2><a class="toc-backref" href="#id31" id="sip-v4-7-8" name="sip-v4-7-8">2.1 SIP v4.7.8</a></h2>
+<h2><a class="toc-backref" href="#id31" id="sip-v4-8" name="sip-v4-8">2.1 SIP v4.8</a></h2>
+<p>Prior to this version the <a class="reference" href="#sipwrapper">sipWrapper</a> structure had a member called <tt class="docutils literal"><span class="pre">user</span></tt>
+which is available for handwritten code to use. From this version <tt class="docutils literal"><span class="pre">user</span></tt> is
+a member of the <a class="reference" href="#sipsimplewrapper">sipSimpleWrapper</a> structure. <a class="reference" href="#sipwrapper">sipWrapper</a> pointers can be
+safely cast to <a class="reference" href="#sipsimplewrapper">sipSimpleWrapper</a> pointers, so if your code does something
+like:</p>
+<pre class="literal-block">
+((sipWrapper *)obj)->user = an_object_reference;
+</pre>
+<p>then you just need to change it to:</p>
+<pre class="literal-block">
+((sipSimpleWrapper *)obj)->user = an_object_reference;
+</pre>
+<p>The generated class names are now <tt class="docutils literal"><span class="pre">const</span> <span class="pre">char</span> <span class="pre">*</span></tt> rather than <tt class="docutils literal"><span class="pre">char</span> <span class="pre">*</span></tt>.</p>
+<p>The following deprecated parts of the API have been removed.</p>
+<blockquote>
+<ul class="simple">
+<li>The <tt class="docutils literal"><span class="pre">a</span></tt>, <tt class="docutils literal"><span class="pre">A</span></tt>, <tt class="docutils literal"><span class="pre">M</span></tt>, <tt class="docutils literal"><span class="pre">N</span></tt>, <tt class="docutils literal"><span class="pre">O</span></tt>, <tt class="docutils literal"><span class="pre">P</span></tt> and <tt class="docutils literal"><span class="pre">T</span></tt> format characters
+from <a class="reference" href="#sipbuildresult">sipBuildResult()</a> and <a class="reference" href="#sipcallmethod">sipCallMethod()</a>.</li>
+<li>The <tt class="docutils literal"><span class="pre">a</span></tt>, <tt class="docutils literal"><span class="pre">A</span></tt>, <tt class="docutils literal"><span class="pre">L</span></tt> and <tt class="docutils literal"><span class="pre">M</span></tt> format characters from
+<a class="reference" href="#sipparseresult">sipParseResult()</a>.</li>
+<li><tt class="docutils literal"><span class="pre">sipConvertToCpp()</span></tt>, <tt class="docutils literal"><span class="pre">sipIsSubClassInstance()</span></tt> and <tt class="docutils literal"><span class="pre">sipTransfer()</span></tt>.</li>
+<li>The old-style generated type convertors.</li>
+<li>The <tt class="docutils literal"><span class="pre">transfer()</span></tt> function of the <tt class="docutils literal"><span class="pre">sip</span></tt> module.</li>
+</ul>
+</blockquote>
+<p>In addition the deprecated <tt class="docutils literal"><span class="pre">-a</span></tt> command line option to <tt class="docutils literal"><span class="pre">configure.py</span></tt> has
+been removed.</p>
+<p>The following parts of the API are now deprecated (but still supported).</p>
+<blockquote>
+<ul class="simple">
+<li>The <a class="reference" href="#generated-type-objects">Generated Type Objects</a>.</li>
+<li>The <a class="reference" href="#generated-named-enum-type-objects">Generated Named Enum Type Objects</a>.</li>
+<li><a class="reference" href="#sipconvertfrominstance">sipConvertFromInstance()</a></li>
+<li><a class="reference" href="#sipconvertfrommappedtype">sipConvertFromMappedType()</a></li>
+<li><a class="reference" href="#sipconvertfromnamedenum">sipConvertFromNamedEnum()</a></li>
+<li><a class="reference" href="#sipconvertfromnewinstance">sipConvertFromNewInstance()</a></li>
+<li><a class="reference" href="#sipcanconverttoinstance">sipCanConvertToInstance()</a></li>
+<li><a class="reference" href="#sipcanconverttomappedtype">sipCanConvertToMappedType()</a></li>
+<li><a class="reference" href="#sipconverttoinstance">sipConvertToInstance()</a></li>
+<li><a class="reference" href="#sipconverttomappedtype">sipConvertToMappedType()</a></li>
+<li><a class="reference" href="#sipforceconverttoinstance">sipForceConvertToInstance()</a></li>
+<li><a class="reference" href="#sipforceconverttomappedtype">sipForceConvertToMappedType()</a></li>
+<li><a class="reference" href="#sipclassname">sipClassName()</a></li>
+<li><a class="reference" href="#sipfindclass">sipFindClass()</a></li>
+<li><a class="reference" href="#sipfindnamedenum">sipFindNamedEnum()</a></li>
+<li><a class="reference" href="#sipfindmappedtype">sipFindMappedType()</a></li>
+<li><a class="reference" href="#sipgetwrapper">sipGetWrapper()</a></li>
+<li><a class="reference" href="#sipreleaseinstance">sipReleaseInstance()</a></li>
+<li><a class="reference" href="#sipreleasemappedtype">sipReleaseMappedType()</a></li>
+<li><a class="reference" href="#sipwrapper-check">sipWrapper_Check()</a></li>
+<li>The <tt class="docutils literal"><span class="pre">B</span></tt>, <tt class="docutils literal"><span class="pre">C</span></tt> and <tt class="docutils literal"><span class="pre">E</span></tt> format characters of <a class="reference" href="#sipbuildresult">sipBuildResult()</a> and
+<a class="reference" href="#sipcallmethod">sipCallMethod()</a>.</li>
+<li>The <tt class="docutils literal"><span class="pre">C</span></tt> and <tt class="docutils literal"><span class="pre">E</span></tt> format character of <a class="reference" href="#sipparseresult">sipParseResult()</a>.</li>
+</ul>
+</blockquote>
+<p>The following PyQt-specific support functions have been removed.</p>
+<blockquote>
+<ul class="simple">
+<li><tt class="docutils literal"><span class="pre">sipConnectRx()</span></tt></li>
+<li><tt class="docutils literal"><span class="pre">sipDisconnectRx()</span></tt></li>
+<li><tt class="docutils literal"><span class="pre">sipEmitSlot()</span></tt></li>
+<li><tt class="docutils literal"><span class="pre">sipGetSender()</span></tt></li>
+</ul>
+</blockquote>
+<p>The handling of virtual methods in <a class="reference" href="#methodcode">%MethodCode</a> has been simplified slightly
+and the <tt class="docutils literal"><span class="pre">sipProtectVirt_*()</span></tt> functions are no longer generated.</p>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id32" id="sip-v4-7-8" name="sip-v4-7-8">2.2 SIP v4.7.8</a></h2>
<p>This version allows a Python int object to be passed whenever an enum is
expected. This can mean that two signatures that were different with prior
versions are now the same as far as Python is concerned. The <a class="reference" href="#constrained">Constrained</a>
@@ -693,7 +789,7 @@ annotation can now be applied to an enum argument to revert to the earlier
behaviour.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id32" id="sip-v4-7-3" name="sip-v4-7-3">2.2 SIP v4.7.3</a></h2>
+<h2><a class="toc-backref" href="#id33" id="sip-v4-7-3" name="sip-v4-7-3">2.3 SIP v4.7.3</a></h2>
<p>Prior to this version SIP did not automatically generate missing complementary
comparison operators. Typically this was worked around by adding them
explicitly to the .sip files, even though they weren't implemented in C++ and
@@ -705,17 +801,15 @@ operators. If you have added such operators explicitly then you should remove
them or make them dependent on the particular version of SIP.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id33" id="sip-v4-4" name="sip-v4-4">2.3 SIP v4.4</a></h2>
+<h2><a class="toc-backref" href="#id34" id="sip-v4-4" name="sip-v4-4">2.4 SIP v4.4</a></h2>
<blockquote>
<ul class="simple">
<li>The <tt class="docutils literal"><span class="pre">SIP_BUILD</span></tt> C preprocessor symbol has been removed.</li>
-<li><a class="reference" href="#sipconverttocpp">sipConvertToCpp()</a>, <a class="reference" href="#sipissubclassinstance">sipIsSubClassInstance()</a> and the old <a class="reference" href="#generated-type-convertors">Generated
-Type Convertors</a> have been deprecated. The functions
-<a class="reference" href="#sipcanconverttoinstance">sipCanConvertToInstance()</a>, <a class="reference" href="#sipconverttoinstance">sipConvertToInstance()</a>,
-<a class="reference" href="#sipforceconverttoinstance">sipForceConvertToInstance()</a>, <a class="reference" href="#sipconvertfrominstance">sipConvertFromInstance()</a>,
-<a class="reference" href="#sipconvertfromnewinstance">sipConvertFromNewInstance()</a>, <a class="reference" href="#sipcanconverttomappedtype">sipCanConvertToMappedType()</a>,
-<a class="reference" href="#sipconverttomappedtype">sipConvertToMappedType()</a>, <a class="reference" href="#sipforceconverttomappedtype">sipForceConvertToMappedType()</a> and
-<a class="reference" href="#sipconvertfrommappedtype">sipConvertFromMappedType()</a> should be used instead. Handwritten
+<li><tt class="docutils literal"><span class="pre">sipConvertToCpp()</span></tt>, <tt class="docutils literal"><span class="pre">sipIsSubClassInstance()</span></tt> and the old-style
+generated type convertors have been deprecated. The functions
+<a class="reference" href="#sipcanconverttotype">sipCanConvertToType()</a>, <a class="reference" href="#sipconverttotype">sipConvertToType()</a>,
+<a class="reference" href="#sipforceconverttotype">sipForceConvertToType()</a>, <a class="reference" href="#sipconvertfromtype">sipConvertFromType()</a> and
+<a class="reference" href="#sipconvertfromnewtype">sipConvertFromNewType()</a> should be used instead. Handwritten
<a class="reference" href="#convertfromtypecode">%ConvertFromTypeCode</a> and <a class="reference" href="#converttotypecode">%ConvertToTypeCode</a> now has the
responsibility for using these to implement the <tt class="docutils literal"><span class="pre">Transfer</span></tt> and
<tt class="docutils literal"><span class="pre">TransferBack</span></tt> annotations.</li>
@@ -724,16 +818,16 @@ responsibility for using these to implement the <tt class="docutils literal"><sp
</div>
</div>
<div class="section">
-<h1><a class="toc-backref" href="#id34" id="installing-sip" name="installing-sip">3 Installing SIP</a></h1>
+<h1><a class="toc-backref" href="#id35" id="installing-sip" name="installing-sip">3 Installing SIP</a></h1>
<div class="section">
-<h2><a class="toc-backref" href="#id35" id="downloading-sip" name="downloading-sip">3.1 Downloading SIP</a></h2>
+<h2><a class="toc-backref" href="#id36" id="downloading-sip" name="downloading-sip">3.1 Downloading SIP</a></h2>
<p>You can get the latest release of the SIP source code from
<a class="reference" href="http://www.riverbankcomputing.com/software/sip/download">http://www.riverbankcomputing.com/software/sip/download</a>.</p>
<p>SIP is also included with all of the major Linux distributions. However, it
may be a version or two out of date.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id36" id="configuring-sip" name="configuring-sip">3.2 Configuring SIP</a></h2>
+<h2><a class="toc-backref" href="#id37" id="configuring-sip" name="configuring-sip">3.2 Configuring SIP</a></h2>
<p>After unpacking the source package (either a <tt class="docutils literal"><span class="pre">.tar.gz</span></tt> or a <tt class="docutils literal"><span class="pre">.zip</span></tt> file
depending on your platform) you should then check for any <tt class="docutils literal"><span class="pre">README</span></tt> files
that relate to your platform.</p>
@@ -758,13 +852,6 @@ interpreter for which you wish SIP to generate bindings for.</p>
<kbd><span class="option">-h</span></kbd></td>
<td>Display a help message.</td></tr>
<tr><td class="option-group">
-<kbd><span class="option">-a</span></kbd></td>
-<td>Export all symbols in any SIP generated module and the SIP module
-itself. This was the default behaviour of SIP prior to v4.2.
-Normally only a module's inititialisation function is exported. This
-option is deprecated as the <tt class="docutils literal"><span class="pre">ModuleMakefile</span></tt> class of <a class="reference" href="#the-sip-build-system">The SIP Build
-System</a> allows this to be specified on a per module basis.</td></tr>
-<tr><td class="option-group">
<kbd><span class="option">-b <var>dir</var></span></kbd></td>
<td>The SIP code generator will be installed in the directory <tt class="docutils literal"><span class="pre">dir</span></tt>.</td></tr>
<tr><td class="option-group">
@@ -819,7 +906,7 @@ This defines each <tt class="docutils literal"><span class="pre">name</span></tt
give you a good idea of how the build system uses the different options. It is
covered in detail in <a class="reference" href="#the-sip-build-system">The SIP Build System</a>.</p>
<div class="section">
-<h3><a class="toc-backref" href="#id37" id="configuring-sip-using-mingw" name="configuring-sip-using-mingw">3.2.1 Configuring SIP Using MinGW</a></h3>
+<h3><a class="toc-backref" href="#id38" id="configuring-sip-using-mingw" name="configuring-sip-using-mingw">3.2.1 Configuring SIP Using MinGW</a></h3>
<p>SIP, and the modules it generates, can be built with MinGW, the Windows port of
GCC. You must use the <tt class="docutils literal"><span class="pre">-p</span></tt> command line option to specify the correct
platform. For example:</p>
@@ -828,7 +915,7 @@ c:\python26\python configure.py -p win32-g++
</pre>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id38" id="configuring-sip-using-the-borland-c-compiler" name="configuring-sip-using-the-borland-c-compiler">3.2.2 Configuring SIP Using the Borland C++ Compiler</a></h3>
+<h3><a class="toc-backref" href="#id39" id="configuring-sip-using-the-borland-c-compiler" name="configuring-sip-using-the-borland-c-compiler">3.2.2 Configuring SIP Using the Borland C++ Compiler</a></h3>
<p>SIP, and the modules it generates, can be built with the free Borland C++
compiler. You must use the <tt class="docutils literal"><span class="pre">-p</span></tt> command line option to specify the correct
platform. For example:</p>
@@ -845,7 +932,7 @@ coff2omf python26.lib python26_bcpp.lib
</div>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id39" id="building-sip" name="building-sip">3.3 Building SIP</a></h2>
+<h2><a class="toc-backref" href="#id40" id="building-sip" name="building-sip">3.3 Building SIP</a></h2>
<p>The next step is to build SIP by running your platform's <tt class="docutils literal"><span class="pre">make</span></tt> command. For
example:</p>
<pre class="literal-block">
@@ -860,14 +947,14 @@ make install
</div>
</div>
<div class="section">
-<h1><a class="toc-backref" href="#id40" id="using-sip" name="using-sip">4 Using SIP</a></h1>
+<h1><a class="toc-backref" href="#id41" id="using-sip" name="using-sip">4 Using SIP</a></h1>
<p>Bindings are generated by the SIP code generator from a number of specification
files, typically with a <tt class="docutils literal"><span class="pre">.sip</span></tt> extension. Specification files look very
similar to C and C++ header files, but often with additional information (in
the form of a <em>directive</em> or an <em>annotation</em>) and code so that the bindings
generated can be finely tuned.</p>
<div class="section">
-<h2><a class="toc-backref" href="#id41" id="a-simple-c-example" name="a-simple-c-example">4.1 A Simple C++ Example</a></h2>
+<h2><a class="toc-backref" href="#id42" id="a-simple-c-example" name="a-simple-c-example">4.1 A Simple C++ Example</a></h2>
<p>We start with a simple example. Let's say you have a (fictional) C++ library
that implements a single class called <tt class="docutils literal"><span class="pre">Word</span></tt>. The class has one constructor
that takes a <tt class="docutils literal"><span class="pre">\0</span></tt> terminated character string as its single argument. The
@@ -1001,7 +1088,7 @@ supplied code is placed by SIP in the generated code.</td></tr>
</table>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id42" id="id7" name="id7">4.2 A Simple C Example</a></h2>
+<h2><a class="toc-backref" href="#id43" id="id7" name="id7">4.2 A Simple C Example</a></h2>
<p>Let's now look at a very similar example of wrapping a fictional C library:</p>
<pre class="literal-block">
/* Define the interface to the word library. */
@@ -1047,7 +1134,7 @@ owned by Python.</li>
be used for this example without change.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id43" id="a-more-complex-c-example" name="a-more-complex-c-example">4.3 A More Complex C++ Example</a></h2>
+<h2><a class="toc-backref" href="#id44" id="a-more-complex-c-example" name="a-more-complex-c-example">4.3 A More Complex C++ Example</a></h2>
<p>In this last example we will wrap a fictional C++ library that contains a class
that is derived from a Qt class. This will demonstrate how SIP allows a class
hierarchy to be split across multiple Python extension modules, and will
@@ -1297,7 +1384,7 @@ not mutually exclusive, i.e. any number may be valid at a time.</td></tr>
</table>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id44" id="ownership-of-objects" name="ownership-of-objects">4.4 Ownership of Objects</a></h2>
+<h2><a class="toc-backref" href="#id45" id="ownership-of-objects" name="ownership-of-objects">4.4 Ownership of Objects</a></h2>
<p>When a C++ instance is wrapped a corresponding Python object is created. The
Python object behaves as you would expect in regard to garbage collection - it
is garbage collected when its reference count reaches zero. What then happens
@@ -1322,7 +1409,52 @@ heap using the <tt class="docutils literal"><span class="pre">free()</span></tt>
<p>See also <a class="reference" href="#siptransferto">sipTransferTo()</a>, <a class="reference" href="#siptransferback">sipTransferBack()</a> and <a class="reference" href="#siptransferbreak">sipTransferBreak()</a>.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id45" id="support-for-python-s-buffer-interface" name="support-for-python-s-buffer-interface">4.5 Support for Python's Buffer Interface</a></h2>
+<h2><a class="toc-backref" href="#id46" id="types-and-meta-types" name="types-and-meta-types">4.5 Types and Meta-types</a></h2>
+<p>Every Python object (with the exception of the <tt class="docutils literal"><span class="pre">object</span></tt> object itself) has a
+meta-type and at least one super-type. By default an object's meta-type is the
+meta-type of its first super-type.</p>
+<p>SIP implements two super-types, <tt class="docutils literal"><span class="pre">sip.simplewrapper</span></tt> and <tt class="docutils literal"><span class="pre">sip.wrapper</span></tt>, and
+a meta-type, <tt class="docutils literal"><span class="pre">sip.wrappertype</span></tt>.</p>
+<p><tt class="docutils literal"><span class="pre">sip.simplewrapper</span></tt> is the super-type of <tt class="docutils literal"><span class="pre">sip.wrapper</span></tt>. The super-type of
+<tt class="docutils literal"><span class="pre">sip.simplewrapper</span></tt> is <tt class="docutils literal"><span class="pre">object</span></tt>.</p>
+<p><tt class="docutils literal"><span class="pre">sip.wrappertype</span></tt> is the meta-type of both <tt class="docutils literal"><span class="pre">sip.simplewrapper</span></tt> and
+<tt class="docutils literal"><span class="pre">sip.wrapper</span></tt>. The super-type of <tt class="docutils literal"><span class="pre">sip.wrappertype</span></tt> is <tt class="docutils literal"><span class="pre">type</span></tt>.</p>
+<p><tt class="docutils literal"><span class="pre">sip.wrapper</span></tt> supports the concept of object ownership described in
+<a class="reference" href="#ownership-of-objects">Ownership of Objects</a> and, by default, is the super-type of all the types
+that SIP generates.</p>
+<p><tt class="docutils literal"><span class="pre">sip.simplewrapper</span></tt> does not support the concept of object ownership but SIP
+generated types that are sub-classed from it have Python objects that take less
+memory.</p>
+<p>SIP allows a class's meta-type and super-type to be explicitly specified using
+the <a class="reference" href="#metatype">Metatype</a> and <a class="reference" href="#supertype">Supertype</a> class annotations.</p>
+<p>SIP also allows the default meta-type and super-type to be changed for a module
+using the <a class="reference" href="#defaultmetatype">%DefaultMetatype</a> and <a class="reference" href="#defaultsupertype">%DefaultSupertype</a> directives.</p>
+<p>If you want to use your own meta-type or super-type then they must be
+sub-classed from one of the SIP provided types. Your types must be registered
+using <a class="reference" href="#sipregisterpytype">sipRegisterPyType()</a>. This is normally done in code specified using
+the <a class="reference" href="#initialisationcode">%InitialisationCode</a> directive.</p>
+<p>As an example, PyQt4 uses <a class="reference" href="#defaultmetatype">%DefaultMetatype</a> to specify a new meta-type that
+handles the interaction with Qt's own meta-type system. It also uses
+<a class="reference" href="#defaultsupertype">%DefaultSupertype</a> to specify that the smaller <tt class="docutils literal"><span class="pre">sip.simplewrapper</span></tt>
+super-type is normally used. Finally it uses <a class="reference" href="#supertype">Supertype</a> as an annotation of
+the <tt class="docutils literal"><span class="pre">QObject</span></tt> class to override the default and use <tt class="docutils literal"><span class="pre">sip.wrapper</span></tt> as the
+super-type so that the parent/child relationships of <tt class="docutils literal"><span class="pre">QObject</span></tt> instances are
+properly maintained.</p>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id47" id="lazy-type-attributes" name="lazy-type-attributes">4.6 Lazy Type Attributes</a></h2>
+<p>Instead of populating a wrapped type's dictionary with its attributes (or
+descriptors for those attributes) SIP only creates objects for those attributes
+when they are actually needed. This is done to reduce the memory footprint and
+start up time when used to wrap large libraries with hundreds of classes and
+tens of thousands of attributes.</p>
+<p>SIP allows you to extend the handling of lazy attributes to your own attribute
+types by allowing you to register an attribute getter handler (using
+<a class="reference" href="#sipregisterattributegetter">sipRegisterAttributeGetter()</a>). This will be called just before a type's
+dictionary is accessed for the first time.</p>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id48" id="support-for-python-s-buffer-interface" name="support-for-python-s-buffer-interface">4.7 Support for Python's Buffer Interface</a></h2>
<p>SIP supports Python's buffer interface in that whenever C/C++ requires a
<tt class="docutils literal"><span class="pre">char</span></tt> or <tt class="docutils literal"><span class="pre">char</span> <span class="pre">*</span></tt> type then any Python type that supports the buffer
interface (including ordinary Python strings) can be used.</p>
@@ -1330,7 +1462,7 @@ interface (including ordinary Python strings) can be used.</p>
ignored.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id46" id="support-for-wide-characters" name="support-for-wide-characters">4.6 Support for Wide Characters</a></h2>
+<h2><a class="toc-backref" href="#id49" id="support-for-wide-characters" name="support-for-wide-characters">4.8 Support for Wide Characters</a></h2>
<p>SIP v4.6 introduced support for wide characters (i.e. the <tt class="docutils literal"><span class="pre">wchar_t</span></tt> type).
Python's C API includes support for converting between unicode objects and wide
character strings and arrays. When converting from a unicode object to wide
@@ -1352,7 +1484,7 @@ then SIP does not first free the instance's current string or array.</li>
</blockquote>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id47" id="the-python-global-interpreter-lock" name="the-python-global-interpreter-lock">4.7 The Python Global Interpreter Lock</a></h2>
+<h2><a class="toc-backref" href="#id50" id="the-python-global-interpreter-lock" name="the-python-global-interpreter-lock">4.9 The Python Global Interpreter Lock</a></h2>
<p>Python's Global Interpretor Lock (GIL) must be acquired before calls can be
made to the Python API. It should also be released when a potentially
blocking call to C/C++ library is made in order to allow other Python threads
@@ -1371,7 +1503,7 @@ behaviour when required.</p>
</div>
</div>
<div class="section">
-<h1><a class="toc-backref" href="#id48" id="the-sip-command-line" name="the-sip-command-line">5 The SIP Command Line</a></h1>
+<h1><a class="toc-backref" href="#id51" id="the-sip-command-line" name="the-sip-command-line">5 The SIP Command Line</a></h1>
<p>The syntax of the SIP command line is:</p>
<pre class="literal-block">
sip [options] [specification]
@@ -1465,7 +1597,7 @@ messages are disabled.</td></tr>
</table>
</div>
<div class="section">
-<h1><a class="toc-backref" href="#id49" id="sip-specification-files" name="sip-specification-files">6 SIP Specification Files</a></h1>
+<h1><a class="toc-backref" href="#id52" id="sip-specification-files" name="sip-specification-files">6 SIP Specification Files</a></h1>
<p>A SIP specification consists of some C/C++ type and function declarations and
some directives. The declarations may contain annotations which provide SIP
with additional information that cannot be expressed in C/C++. SIP does not
@@ -1506,7 +1638,7 @@ public:
};
</pre>
<div class="section">
-<h2><a class="toc-backref" href="#id50" id="syntax-definition" name="syntax-definition">6.1 Syntax Definition</a></h2>
+<h2><a class="toc-backref" href="#id53" id="syntax-definition" name="syntax-definition">6.1 Syntax Definition</a></h2>
<p>The following is a semi-formal description of the syntax of a specification
file.</p>
<pre class="literal-block">
@@ -1515,17 +1647,14 @@ file.</p>
<em>module-statement</em> ::= [<em>module-directive</em> | <em>statement</em>]
<em>module-directive</em> ::= [<a class="reference" href="#cmodule">%CModule</a> | <a class="reference" href="#compositemodule">%CompositeModule</a> |
- <a class="reference" href="#consolidatedmodule">%ConsolidatedModule</a> | <a class="reference" href="#copying">%Copying</a> | <a class="reference" href="#doc">%Doc</a> | <a class="reference" href="#exporteddoc">%ExportedDoc</a> |
+ <a class="reference" href="#consolidatedmodule">%ConsolidatedModule</a> | <a class="reference" href="#copying">%Copying</a> | <a class="reference" href="#defaultmetatype">%DefaultMetatype</a> |
+ <a class="reference" href="#defaultsupertype">%DefaultSupertype</a> | <a class="reference" href="#doc">%Doc</a> | <a class="reference" href="#exporteddoc">%ExportedDoc</a> |
<a class="reference" href="#exportedheadercode">%ExportedHeaderCode</a> | <a class="reference" href="#feature">%Feature</a> | <a class="reference" href="#import">%Import</a> | <a class="reference" href="#include">%Include</a> |
- <a class="reference" href="#id14">%License</a> | <a class="reference" href="#mappedtype">%MappedType</a> | <em>mapped-type-template</em> |
- <a class="reference" href="#module">%Module</a> | <a class="reference" href="#modulecode">%ModuleCode</a> | <a class="reference" href="#moduleheadercode">%ModuleHeaderCode</a> |
- <a class="reference" href="#optionalinclude">%OptionalInclude</a> | <a class="reference" href="#platforms">%Platforms</a> | <a class="reference" href="#preinitialisationcode">%PreInitialisationCode</a> |
- <a class="reference" href="#postinitialisationcode">%PostInitialisationCode</a> | <em>sip-option-list</em> | <a class="reference" href="#timeline">%Timeline</a> |
- <a class="reference" href="#unitcode">%UnitCode</a>]
-
-<em>sip-option-list</em> :: <a class="reference" href="#sipoptions">%SIPOptions</a> <tt class="docutils literal"><span class="pre">(</span></tt> <em>option-list</em> <tt class="docutils literal"><span class="pre">)</span></tt>
-
-<em>option-list</em> ::= <em>option</em> [<tt class="docutils literal"><span class="pre">,</span></tt> <em>option-list</em>]
+ <a class="reference" href="#initialisationcode">%InitialisationCode</a> | <a class="reference" href="#id14">%License</a> | <a class="reference" href="#mappedtype">%MappedType</a> |
+ <em>mapped-type-template</em> | <a class="reference" href="#module">%Module</a> | <a class="reference" href="#modulecode">%ModuleCode</a> |
+ <a class="reference" href="#moduleheadercode">%ModuleHeaderCode</a> | <a class="reference" href="#optionalinclude">%OptionalInclude</a> | <a class="reference" href="#platforms">%Platforms</a> |
+ <a class="reference" href="#preinitialisationcode">%PreInitialisationCode</a> | <a class="reference" href="#postinitialisationcode">%PostInitialisationCode</a> |
+ <a class="reference" href="#timeline">%Timeline</a> | <a class="reference" href="#unitcode">%UnitCode</a>]
<em>statement</em> :: [<em>class-statement</em> | <em>function</em> | <em>variable</em>]
@@ -1734,6 +1863,8 @@ file.</p>
<em>template</em> ::= <em>scoped-name</em> <tt class="docutils literal"><span class="pre"><</span></tt> <em>type-list</em> <tt class="docutils literal"><span class="pre">></span></tt>
+<em>dotted-name</em> ::= <em>name</em> [<tt class="docutils literal"><span class="pre">.</span></tt> <em>dotted-name</em>]
+
<em>name</em> ::= _A-Za-z {_A-Za-z0-9}
</pre>
<p>Here is a short list of differences between C++ and the subset supported by
@@ -1750,80 +1881,80 @@ class or a named enum that has been wrapped in the same module.</li>
</blockquote>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id51" id="variable-numbers-of-arguments" name="variable-numbers-of-arguments">6.2 Variable Numbers of Arguments</a></h2>
+<h2><a class="toc-backref" href="#id54" id="variable-numbers-of-arguments" name="variable-numbers-of-arguments">6.2 Variable Numbers of Arguments</a></h2>
<p>SIP supports the use of <tt class="docutils literal"><span class="pre">...</span></tt> as the last part of a function signature. Any
remaining arguments are collected as a Python tuple.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id52" id="additional-sip-types" name="additional-sip-types">6.3 Additional SIP Types</a></h2>
+<h2><a class="toc-backref" href="#id55" id="additional-sip-types" name="additional-sip-types">6.3 Additional SIP Types</a></h2>
<p>SIP supports a number of additional data types that can be used in Python
signatures.</p>
<div class="section">
-<h3><a class="toc-backref" href="#id53" id="sip-anyslot" name="sip-anyslot">6.3.1 SIP_ANYSLOT</a></h3>
+<h3><a class="toc-backref" href="#id56" id="sip-anyslot" name="sip-anyslot">6.3.1 SIP_ANYSLOT</a></h3>
<p>This is both a <tt class="docutils literal"><span class="pre">const</span> <span class="pre">char</span> <span class="pre">*</span></tt> and a <tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> that is used as the type
of the member instead of <tt class="docutils literal"><span class="pre">const</span> <span class="pre">char</span> <span class="pre">*</span></tt> in functions that implement the
connection or disconnection of an explicitly generated signal to a slot.
Handwritten code must be provided to interpret the conversion correctly.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id54" id="sip-pycallable" name="sip-pycallable">6.3.2 SIP_PYCALLABLE</a></h3>
+<h3><a class="toc-backref" href="#id57" id="sip-pycallable" name="sip-pycallable">6.3.2 SIP_PYCALLABLE</a></h3>
<p>This is a <tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> that is a Python callable object.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id55" id="sip-pydict" name="sip-pydict">6.3.3 SIP_PYDICT</a></h3>
+<h3><a class="toc-backref" href="#id58" id="sip-pydict" name="sip-pydict">6.3.3 SIP_PYDICT</a></h3>
<p>This is a <tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> that is a Python dictionary object.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id56" id="sip-pylist" name="sip-pylist">6.3.4 SIP_PYLIST</a></h3>
+<h3><a class="toc-backref" href="#id59" id="sip-pylist" name="sip-pylist">6.3.4 SIP_PYLIST</a></h3>
<p>This is a <tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> that is a Python list object.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id57" id="sip-pyobject" name="sip-pyobject">6.3.5 SIP_PYOBJECT</a></h3>
+<h3><a class="toc-backref" href="#id60" id="sip-pyobject" name="sip-pyobject">6.3.5 SIP_PYOBJECT</a></h3>
<p>This is a <tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> of any Python type.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id58" id="sip-pyslice" name="sip-pyslice">6.3.6 SIP_PYSLICE</a></h3>
+<h3><a class="toc-backref" href="#id61" id="sip-pyslice" name="sip-pyslice">6.3.6 SIP_PYSLICE</a></h3>
<p>This is a <tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> that is a Python slice object.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id59" id="sip-pytuple" name="sip-pytuple">6.3.7 SIP_PYTUPLE</a></h3>
+<h3><a class="toc-backref" href="#id62" id="sip-pytuple" name="sip-pytuple">6.3.7 SIP_PYTUPLE</a></h3>
<p>This is a <tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> that is a Python tuple object.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id60" id="sip-pytype" name="sip-pytype">6.3.8 SIP_PYTYPE</a></h3>
+<h3><a class="toc-backref" href="#id63" id="sip-pytype" name="sip-pytype">6.3.8 SIP_PYTYPE</a></h3>
<p>This is a <tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> that is a Python type object.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id61" id="sip-qobject" name="sip-qobject">6.3.9 SIP_QOBJECT</a></h3>
+<h3><a class="toc-backref" href="#id64" id="sip-qobject" name="sip-qobject">6.3.9 SIP_QOBJECT</a></h3>
<p>This is a <tt class="docutils literal"><span class="pre">QObject</span> <span class="pre">*</span></tt> that is a C++ instance of a class derived from Qt's
<tt class="docutils literal"><span class="pre">QObject</span></tt> class.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id62" id="sip-rxobj-con" name="sip-rxobj-con">6.3.10 SIP_RXOBJ_CON</a></h3>
+<h3><a class="toc-backref" href="#id65" id="sip-rxobj-con" name="sip-rxobj-con">6.3.10 SIP_RXOBJ_CON</a></h3>
<p>This is a <tt class="docutils literal"><span class="pre">QObject</span> <span class="pre">*</span></tt> that is a C++ instance of a class derived from Qt's
<tt class="docutils literal"><span class="pre">QObject</span></tt> class. It is used as the type of the receiver instead of <tt class="docutils literal"><span class="pre">const</span>
<span class="pre">QObject</span> <span class="pre">*</span></tt> in functions that implement a connection to a slot.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id63" id="sip-rxobj-dis" name="sip-rxobj-dis">6.3.11 SIP_RXOBJ_DIS</a></h3>
+<h3><a class="toc-backref" href="#id66" id="sip-rxobj-dis" name="sip-rxobj-dis">6.3.11 SIP_RXOBJ_DIS</a></h3>
<p>This is a <tt class="docutils literal"><span class="pre">QObject</span> <span class="pre">*</span></tt> that is a C++ instance of a class derived from Qt's
<tt class="docutils literal"><span class="pre">QObject</span></tt> class. It is used as the type of the receiver instead of <tt class="docutils literal"><span class="pre">const</span>
<span class="pre">QObject</span> <span class="pre">*</span></tt> in functions that implement a disconnection from a slot.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id64" id="sip-signal" name="sip-signal">6.3.12 SIP_SIGNAL</a></h3>
+<h3><a class="toc-backref" href="#id67" id="sip-signal" name="sip-signal">6.3.12 SIP_SIGNAL</a></h3>
<p>This is a <tt class="docutils literal"><span class="pre">const</span> <span class="pre">char</span> <span class="pre">*</span></tt> that is used as the type of the signal instead of
<tt class="docutils literal"><span class="pre">const</span> <span class="pre">char</span> <span class="pre">*</span></tt> in functions that implement the connection or disconnection
of an explicitly generated signal to a slot.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id65" id="sip-slot" name="sip-slot">6.3.13 SIP_SLOT</a></h3>
+<h3><a class="toc-backref" href="#id68" id="sip-slot" name="sip-slot">6.3.13 SIP_SLOT</a></h3>
<p>This is a <tt class="docutils literal"><span class="pre">const</span> <span class="pre">char</span> <span class="pre">*</span></tt> that is used as the type of the member instead of
<tt class="docutils literal"><span class="pre">const</span> <span class="pre">char</span> <span class="pre">*</span></tt> in functions that implement the connection or disconnection
of an explicitly generated signal to a slot.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id66" id="sip-slot-con" name="sip-slot-con">6.3.14 SIP_SLOT_CON</a></h3>
+<h3><a class="toc-backref" href="#id69" id="sip-slot-con" name="sip-slot-con">6.3.14 SIP_SLOT_CON</a></h3>
<p>This is a <tt class="docutils literal"><span class="pre">const</span> <span class="pre">char</span> <span class="pre">*</span></tt> that is used as the type of the member instead of
<tt class="docutils literal"><span class="pre">const</span> <span class="pre">char</span> <span class="pre">*</span></tt> in functions that implement the connection of an internally
generated signal to a slot. The type includes a comma separated list of types
@@ -1841,7 +1972,7 @@ bool connectItem(int, SIP_RXOBJ_CON, SIP_SLOT_CON(int));
</pre>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id67" id="sip-slot-dis" name="sip-slot-dis">6.3.15 SIP_SLOT_DIS</a></h3>
+<h3><a class="toc-backref" href="#id70" id="sip-slot-dis" name="sip-slot-dis">6.3.15 SIP_SLOT_DIS</a></h3>
<p>This is a <tt class="docutils literal"><span class="pre">const</span> <span class="pre">char</span> <span class="pre">*</span></tt> that is used as the type of the member instead of
<tt class="docutils literal"><span class="pre">const</span> <span class="pre">char</span> <span class="pre">*</span></tt> in functions that implement the disconnection of an
internally generated signal to a slot. The type includes a comma separated
@@ -1850,7 +1981,7 @@ list of types that is the C++ signature of of the signal.</p>
</div>
</div>
<div class="section">
-<h1><a class="toc-backref" href="#id68" id="sip-directives" name="sip-directives">7 SIP Directives</a></h1>
+<h1><a class="toc-backref" href="#id71" id="sip-directives" name="sip-directives">7 SIP Directives</a></h1>
<p>In this section we describe each of the directives that can be used in
specification files. All directives begin with <tt class="docutils literal"><span class="pre">%</span></tt> as the first
non-whitespace character in a line.</p>
@@ -1860,7 +1991,7 @@ are enclosed in [<em>brackets</em>].</p>
<p>Some directives are used to specify handwritten code. Handwritten code must
not define names that start with the prefix <tt class="docutils literal"><span class="pre">sip</span></tt>.</p>
<div class="section">
-<h2><a class="toc-backref" href="#id69" id="accesscode" name="accesscode">7.1 %AccessCode</a></h2>
+<h2><a class="toc-backref" href="#id72" id="accesscode" name="accesscode">7.1 %AccessCode</a></h2>
<pre class="literal-block">
%AccessCode
<em>code</em>
@@ -1887,7 +2018,7 @@ Klass *klassInstance;
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id70" id="bigetcharbuffercode" name="bigetcharbuffercode">7.2 %BIGetCharBufferCode</a></h2>
+<h2><a class="toc-backref" href="#id73" id="bigetcharbuffercode" name="bigetcharbuffercode">7.2 %BIGetCharBufferCode</a></h2>
<pre class="literal-block">
%BIGetCharBufferCode
<em>code</em>
@@ -1915,7 +2046,7 @@ i.e. <tt class="docutils literal"><span class="pre">self</span></tt>.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id71" id="bigetreadbuffercode" name="bigetreadbuffercode">7.3 %BIGetReadBufferCode</a></h2>
+<h2><a class="toc-backref" href="#id74" id="bigetreadbuffercode" name="bigetreadbuffercode">7.3 %BIGetReadBufferCode</a></h2>
<pre class="literal-block">
%BIGetReadBufferCode
<em>code</em>
@@ -1942,7 +2073,7 @@ i.e. <tt class="docutils literal"><span class="pre">self</span></tt>.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id72" id="bigetsegcountcode" name="bigetsegcountcode">7.4 %BIGetSegCountCode</a></h2>
+<h2><a class="toc-backref" href="#id75" id="bigetsegcountcode" name="bigetsegcountcode">7.4 %BIGetSegCountCode</a></h2>
<pre class="literal-block">
%BIGetSegCountCode
<em>code</em>
@@ -1968,7 +2099,7 @@ i.e. <tt class="docutils literal"><span class="pre">self</span></tt>.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id73" id="bigetwritebuffercode" name="bigetwritebuffercode">7.5 %BIGetWriteBufferCode</a></h2>
+<h2><a class="toc-backref" href="#id76" id="bigetwritebuffercode" name="bigetwritebuffercode">7.5 %BIGetWriteBufferCode</a></h2>
<pre class="literal-block">
%BIGetWriteBufferCode
<em>code</em>
@@ -1995,7 +2126,7 @@ i.e. <tt class="docutils literal"><span class="pre">self</span></tt>.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id74" id="cmodule" name="cmodule">7.6 %CModule</a></h2>
+<h2><a class="toc-backref" href="#id77" id="cmodule" name="cmodule">7.6 %CModule</a></h2>
<pre class="literal-block">
%CModule <em>name</em> [<em>version</em>]
</pre>
@@ -2008,7 +2139,7 @@ library and to define the name of the module and it's optional version number.</
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id75" id="compositemodule" name="compositemodule">7.7 %CompositeModule</a></h2>
+<h2><a class="toc-backref" href="#id78" id="compositemodule" name="compositemodule">7.7 %CompositeModule</a></h2>
<pre class="literal-block">
%CompositeModule <em>name</em>
</pre>
@@ -2035,7 +2166,7 @@ component module.</p>
don't have to remember which which individual module an object is defined in.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id76" id="consolidatedmodule" name="consolidatedmodule">7.8 %ConsolidatedModule</a></h2>
+<h2><a class="toc-backref" href="#id79" id="consolidatedmodule" name="consolidatedmodule">7.8 %ConsolidatedModule</a></h2>
<pre class="literal-block">
%ConsolidatedModule <em>name</em>
</pre>
@@ -2064,7 +2195,7 @@ building as a component the <tt class="docutils literal"><span class="pre">-p</s
specify the name of the consolidated module.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id77" id="convertfromtypecode" name="convertfromtypecode">7.9 %ConvertFromTypeCode</a></h2>
+<h2><a class="toc-backref" href="#id80" id="convertfromtypecode" name="convertfromtypecode">7.9 %ConvertFromTypeCode</a></h2>
<pre class="literal-block">
%ConvertFromTypeCode
<em>code</em>
@@ -2110,7 +2241,7 @@ list of <tt class="docutils literal"><span class="pre">QWidget</span></tt> insta
// Get the Python wrapper for the QWidget instance, creating a new
// one if necessary, and handle any ownership transfer.
- if ((wobj = sipConvertFromInstance(w, sipClass_QWidget, sipTransferObj)) == NULL)
+ if ((wobj = sipConvertFromType(w, sipType_QWidget, sipTransferObj)) == NULL)
{
// There was an error so garbage collect the Python list.
Py_DECREF(l);
@@ -2127,7 +2258,7 @@ list of <tt class="docutils literal"><span class="pre">QWidget</span></tt> insta
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id78" id="converttosubclasscode" name="converttosubclasscode">7.10 %ConvertToSubClassCode</a></h2>
+<h2><a class="toc-backref" href="#id81" id="converttosubclasscode" name="converttosubclasscode">7.10 %ConvertToSubClassCode</a></h2>
<pre class="literal-block">
%ConvertToSubClassCode
<em>code</em>
@@ -2161,13 +2292,22 @@ possible that the C++ address of the instance as the sub-class is
different to that of the super-class. If so, then this must be set to the
C++ address of the instance when cast (usually using <tt class="docutils literal"><span class="pre">static_cast</span></tt>)
from the super-class to the sub-class.</dd>
+<dt>const sipTypeDef *sipType</dt>
+<dd>The handwritten code must set this to the SIP generated type structure
+that corresponds to the class instance. (The type structure for class
+<tt class="docutils literal"><span class="pre">Klass</span></tt> is <tt class="docutils literal"><span class="pre">sipType_Klass</span></tt>.) If the RTTI of the class instance isn't
+recognised then <tt class="docutils literal"><span class="pre">sipType</span></tt> must be set to <tt class="docutils literal"><span class="pre">NULL</span></tt>. The code doesn't
+have to recognise the exact class, only the most specific sub-class that
+it can.</dd>
<dt>sipWrapperType *sipClass</dt>
-<dd>The handwritten code must set this to the SIP generated Python type object
+<dd><p class="first">The handwritten code must set this to the SIP generated Python type object
that corresponds to the class instance. (The type object for class
<tt class="docutils literal"><span class="pre">Klass</span></tt> is <tt class="docutils literal"><span class="pre">sipClass_Klass</span></tt>.) If the RTTI of the class instance isn't
recognised then <tt class="docutils literal"><span class="pre">sipClass</span></tt> must be set to <tt class="docutils literal"><span class="pre">NULL</span></tt>. The code doesn't
have to recognise the exact class, only the most specific sub-class that
-it can.</dd>
+it can.</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use <tt class="docutils literal"><span class="pre">sipType</span></tt>.</p>
+</dd>
</dl>
<p>The handwritten code must not explicitly return.</p>
<p>The following example shows the sub-class conversion code for <tt class="docutils literal"><span class="pre">QEvent</span></tt> based
@@ -2177,22 +2317,22 @@ class QEvent
{
%ConvertToSubClassCode
// QEvent sub-classes provide a unique type ID.
- switch (sipCpp -> type())
+ switch (sipCpp->type())
{
case QEvent::Timer:
- sipClass = sipClass_QTimerEvent;
+ sipType = sipType_QTimerEvent;
break;
case QEvent::KeyPress:
case QEvent::KeyRelease:
- sipClass = sipClass_QKeyEvent;
+ sipType = sipType_QKeyEvent;
break;
// Skip the remaining event types to keep the example short.
default:
// We don't recognise the type.
- sipClass = NULL;
+ sipType = NULL;
}
%End
@@ -2200,12 +2340,9 @@ class QEvent
};
</pre>
-<p>The SIP API includes the <a class="reference" href="#sipmapinttoclass">sipMapIntToClass()</a> and <a class="reference" href="#sipmapstringtoclass">sipMapStringToClass()</a>
-functions that convert integer and string based RTTI to Python type objects
-based on ordered lookup tables.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id79" id="converttotypecode" name="converttotypecode">7.11 %ConvertToTypeCode</a></h2>
+<h2><a class="toc-backref" href="#id82" id="converttotypecode" name="converttotypecode">7.11 %ConvertToTypeCode</a></h2>
<pre class="literal-block">
%ConvertToTypeCode
<em>code</em>
@@ -2274,8 +2411,8 @@ Classes</a>.</li>
// disallow None because it is a list of QPoint, not of a pointer
// to a QPoint, so None isn't appropriate.
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i),
- sipClass_QPoint, SIP_NOT_NONE))
+ if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i),
+ sipType_QPoint, SIP_NOT_NONE))
return 0;
// The type is valid.
@@ -2293,16 +2430,16 @@ Classes</a>.</li>
// Get the address of the element's C++ instance. Note that, in
// this case, we don't apply any ownership changes to the list
// elements, only to the list itself.
- qp = reinterpret_cast<QPoint *>(sipConvertToInstance(
+ qp = reinterpret_cast<QPoint *>(sipConvertToType(
PyList_GET_ITEM(sipPy, i),
- sipClass_QPoint, 0,
+ sipType_QPoint, 0,
SIP_NOT_NONE,
&state, sipIsErr));
// Deal with any errors.
if (*sipIsErr)
{
- sipReleaseInstance(qp, sipClass_QPoint, state);
+ sipReleaseType(qp, sipType_QPoint, state);
// Tidy up.
delete ql;
@@ -2316,8 +2453,8 @@ Classes</a>.</li>
// A copy of the QPoint was appended to the list so we no longer
// need it. It may be a temporary instance that should be
// destroyed, or a wrapped instance that should not be destroyed.
- // sipReleaseInstance() will do the right thing.
- sipReleaseInstance(qp, sipClass_QPoint, state);
+ // sipReleaseType() will do the right thing.
+ sipReleaseType(qp, sipType_QPoint, state);
}
// Return the instance.
@@ -2334,13 +2471,12 @@ Classes</a>.</li>
would normally be automatically generated. This means that the handwritten
code must also handle instances of the class itself and not just the additional
types that are being supported. This should be done by making calls to
-<a class="reference" href="#sipcanconverttoinstance">sipCanConvertToInstance()</a> to check the object type and
-<a class="reference" href="#sipconverttoinstance">sipConvertToInstance()</a> to convert the object. The <tt class="docutils literal"><span class="pre">SIP_NO_CONVERTORS</span></tt>
-flag <em>must</em> be passed to both these functions to prevent recursive calls to the
-handwritten code.</p>
+<a class="reference" href="#sipcanconverttotype">sipCanConvertToType()</a> to check the object type and <a class="reference" href="#sipconverttotype">sipConvertToType()</a> to
+convert the object. The <tt class="docutils literal"><span class="pre">SIP_NO_CONVERTORS</span></tt> flag <em>must</em> be passed to both
+these functions to prevent recursive calls to the handwritten code.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id80" id="copying" name="copying">7.12 %Copying</a></h2>
+<h2><a class="toc-backref" href="#id83" id="copying" name="copying">7.12 %Copying</a></h2>
<pre class="literal-block">
%Copying
<em>text</em>
@@ -2352,12 +2488,44 @@ include copyright and licensing terms.</p>
<p>For example:</p>
<pre class="literal-block">
%Copying
-Copyright (c) 2007 Riverbank Computing Limited
+Copyright (c) 2008 Riverbank Computing Limited
%End
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id81" id="doc" name="doc">7.13 %Doc</a></h2>
+<h2><a class="toc-backref" href="#id84" id="defaultmetatype" name="defaultmetatype">7.13 %DefaultMetatype</a></h2>
+<pre class="literal-block">
+%DefaultMetatype <em>dotted-name</em>
+</pre>
+<p>This directive is used to specify the Python type that should be used as the
+meta-type for any C/C++ data type that doesn't have an explicit super-type.</p>
+<p>If this is not specified then <tt class="docutils literal"><span class="pre">sip.wrappertype</span></tt> is used.</p>
+<p>You can also use the <a class="reference" href="#metatype">Metatype</a> class annotation to specify the meta-type
+used by a particular C/C++ type.</p>
+<p>See the section <a class="reference" href="#types-and-meta-types">Types and Meta-types</a> for more details.</p>
+<p>For example:</p>
+<pre class="literal-block">
+%DefaultMetatype PyQt4.QtCore.pyqtWrapperType
+</pre>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id85" id="defaultsupertype" name="defaultsupertype">7.14 %DefaultSupertype</a></h2>
+<pre class="literal-block">
+%DefaultSupertype <em>dotted-name</em>
+</pre>
+<p>This directive is used to specify the Python type that should be used as the
+super-type for any C/C++ data type that doesn't have an explicit super-type.</p>
+<p>If this is not specified then <tt class="docutils literal"><span class="pre">sip.wrapper</span></tt> is used.</p>
+<p>You can also use the <a class="reference" href="#supertype">Supertype</a> class annotation to specify the super-type
+used by a particular C/C++ type.</p>
+<p>See the section <a class="reference" href="#types-and-meta-types">Types and Meta-types</a> for more details.</p>
+<p>For example:</p>
+<pre class="literal-block">
+%DefaultSupertype sip.simplewrapper
+</pre>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id86" id="doc" name="doc">7.15 %Doc</a></h2>
<pre class="literal-block">
%Doc
<em>text</em>
@@ -2383,12 +2551,12 @@ which it is defined.
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id82" id="end" name="end">7.14 %End</a></h2>
+<h2><a class="toc-backref" href="#id87" id="end" name="end">7.16 %End</a></h2>
<p>This isn't a directive in itself, but is used to terminate a number of
directives that allow a block of handwritten code or text to be specified.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id83" id="exception" name="exception">7.15 %Exception</a></h2>
+<h2><a class="toc-backref" href="#id88" id="exception" name="exception">7.17 %Exception</a></h2>
<pre class="literal-block">
%Exception <em>name</em> [(<em>base-exception)]
{
@@ -2430,7 +2598,7 @@ The new exception is called <tt class="docutils literal"><span class="pre">StdEx
Python exception <tt class="docutils literal"><span class="pre">Exception</span></tt>.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id84" id="exporteddoc" name="exporteddoc">7.16 %ExportedDoc</a></h2>
+<h2><a class="toc-backref" href="#id89" id="exporteddoc" name="exporteddoc">7.18 %ExportedDoc</a></h2>
<pre class="literal-block">
%ExportedDoc
<em>text</em>
@@ -2455,7 +2623,7 @@ module in which it is defined and all modules that %Import it.
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id85" id="exportedheadercode" name="exportedheadercode">7.17 %ExportedHeaderCode</a></h2>
+<h2><a class="toc-backref" href="#id90" id="exportedheadercode" name="exportedheadercode">7.19 %ExportedHeaderCode</a></h2>
<pre class="literal-block">
%ExportedHeaderCode
<em>code</em>
@@ -2468,7 +2636,7 @@ Python modules should not explicitly call functions in another Python module.</p
<p>See also <a class="reference" href="#modulecode">%ModuleCode</a> and <a class="reference" href="#moduleheadercode">%ModuleHeaderCode</a>.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id86" id="feature" name="feature">7.18 %Feature</a></h2>
+<h2><a class="toc-backref" href="#id91" id="feature" name="feature">7.20 %Feature</a></h2>
<pre class="literal-block">
%Feature <em>name</em>
</pre>
@@ -2491,7 +2659,7 @@ void foo();
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id87" id="gcclearcode" name="gcclearcode">7.19 %GCClearCode</a></h2>
+<h2><a class="toc-backref" href="#id92" id="gcclearcode" name="gcclearcode">7.21 %GCClearCode</a></h2>
<pre class="literal-block">
%GCClearCode
<em>code</em>
@@ -2538,7 +2706,7 @@ always a Python object and so should be handled by the garbage collector:</p>
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id88" id="gctraversecode" name="gctraversecode">7.20 %GCTraverseCode</a></h2>
+<h2><a class="toc-backref" href="#id93" id="gctraversecode" name="gctraversecode">7.22 %GCTraverseCode</a></h2>
<pre class="literal-block">
%GCTraverseCode
<em>code</em>
@@ -2577,7 +2745,7 @@ collector.</dd>
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id89" id="getcode" name="getcode">7.21 %GetCode</a></h2>
+<h2><a class="toc-backref" href="#id94" id="getcode" name="getcode">7.23 %GetCode</a></h2>
<pre class="literal-block">
%GetCode
<em>code</em>
@@ -2637,7 +2805,7 @@ struct Entity
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id90" id="if" name="if">7.22 %If</a></h2>
+<h2><a class="toc-backref" href="#id95" id="if" name="if">7.24 %If</a></h2>
<pre class="literal-block">
%If (<em>expression</em>)
<em>specification</em>
@@ -2701,6 +2869,7 @@ following parts of a specification are affected by it:</p>
<li><a class="reference" href="#gcclearcode">%GCClearCode</a></li>
<li><a class="reference" href="#gctraversecode">%GCTraverseCode</a></li>
<li><a class="reference" href="#if">%If</a></li>
+<li><a class="reference" href="#initialisationcode">%InitialisationCode</a></li>
<li><a class="reference" href="#mappedtype">%MappedType</a></li>
<li><a class="reference" href="#methodcode">%MethodCode</a></li>
<li><a class="reference" href="#modulecode">%ModuleCode</a></li>
@@ -2721,7 +2890,7 @@ following parts of a specification are affected by it:</p>
nested <a class="reference" href="#if">%If</a> directives.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id91" id="import" name="import">7.23 %Import</a></h2>
+<h2><a class="toc-backref" href="#id96" id="import" name="import">7.25 %Import</a></h2>
<pre class="literal-block">
%Import <em>filename</em>
</pre>
@@ -2739,7 +2908,7 @@ the <tt class="docutils literal"><span class="pre">-I</span></tt> command line o
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id92" id="include" name="include">7.24 %Include</a></h2>
+<h2><a class="toc-backref" href="#id97" id="include" name="include">7.26 %Include</a></h2>
<pre class="literal-block">
%Include <em>filename</em>
</pre>
@@ -2755,7 +2924,27 @@ specification into manageable pieces.</p>
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id93" id="id14" name="id14">7.25 %License</a></h2>
+<h2><a class="toc-backref" href="#id98" id="initialisationcode" name="initialisationcode">7.27 %InitialisationCode</a></h2>
+<pre class="literal-block">
+%InitialisationCode
+ <em>code</em>
+%End
+</pre>
+<p>This directive is used to specify handwritten code that is embedded in-line
+in the generated module initialisation code after the SIP module has been
+imported but before the module itself has been intialised.</p>
+<p>It is typically used to call <a class="reference" href="#sipregisterpytype">sipRegisterPyType()</a>.</p>
+<p>For example:</p>
+<pre class="literal-block">
+%InitialisationCode
+ // The code will be executed when the module is first imported, after
+ // the SIP module has been imported, but before other module-specific
+ // initialisation has been completed.
+%End
+</pre>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id99" id="id14" name="id14">7.28 %License</a></h2>
<pre class="literal-block">
%License /<em>license-annotations</em>/
</pre>
@@ -2773,7 +2962,7 @@ in a module so that it is accessible to Python scripts.</p>
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id94" id="mappedtype" name="mappedtype">7.26 %MappedType</a></h2>
+<h2><a class="toc-backref" href="#id100" id="mappedtype" name="mappedtype">7.29 %MappedType</a></h2>
<pre class="literal-block">
template<<em>type-list</em>>
%MappedType <em>type</em>
@@ -2830,8 +3019,8 @@ template<Type *>
// Now check each element of the list is of the type we expect.
// The template is for a pointer type so we don't disallow None.
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i),
- sipClass_Type, 0))
+ if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i),
+ sipType_Type, 0))
return 0;
return 1;
@@ -2845,9 +3034,9 @@ template<Type *>
// Use the SIP API to convert the Python object to the
// corresponding C++ instance. Note that we apply any ownership
// transfer to the list itself, not the individual elements.
- Type *t = reinterpret_cast<Type *>(sipConvertToInstance(
+ Type *t = reinterpret_cast<Type *>(sipConvertToType(
PyList_GET_ITEM(sipPy, i),
- sipClass_Type, 0, 0, 0,
+ sipType_Type, 0, 0, 0,
sipIsErr));
if (*sipIsErr)
@@ -2884,7 +3073,7 @@ template<Type *>
Type *t = sipCpp -> at(i);
PyObject *tobj;
- if ((tobj = sipConvertFromInstance(t, sipClass_Type, sipTransferObj)) == NULL)
+ if ((tobj = sipConvertFromType(t, sipType_Type, sipTransferObj)) == NULL)
{
// There was an error so garbage collect the Python list.
Py_DECREF(l);
@@ -2905,7 +3094,7 @@ generated code will automatically map this to and from a Python list of QObject
instances when appropriate.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id95" id="methodcode" name="methodcode">7.27 %MethodCode</a></h2>
+<h2><a class="toc-backref" href="#id101" id="methodcode" name="methodcode">7.30 %MethodCode</a></h2>
<pre class="literal-block">
%MethodCode
<em>code</em>
@@ -2998,18 +3187,6 @@ constructors or destructors.</p>
<dd>If the directive is used in the context of a class constructor, destructor
or method then this is the Python object that wraps the the structure or
class instance, i.e. <tt class="docutils literal"><span class="pre">self</span></tt>.</dd>
-<dt>bool sipSelfWasArg</dt>
-<dd><p class="first">This is only made available for non-abstract, virtual methods. It is set
-if <tt class="docutils literal"><span class="pre">self</span></tt> was explicitly passed as the first argument of the method
-rather than being bound to the method. In other words, the call was:</p>
-<pre class="literal-block">
-Klass.foo(self, ...)
-</pre>
-<p>rather than:</p>
-<pre class="last literal-block">
-self.foo(...)
-</pre>
-</dd>
</dl>
<p>If the <a class="reference" href="#noargparser">NoArgParser</a> annotation has been used then only the following
variables are made available to the handwritten code:</p>
@@ -3034,8 +3211,7 @@ public:
if (PyArg_ParseTuple(a0, "ii", &iarr[0], &iarr[1]))
{
Py_BEGIN_ALLOW_THREADS
- sipRes = sipSelfWasArg ? sipCpp -> Klass::foo(iarr)
- : sipCpp -> foo(iarr);
+ sipCpp -> Klass::foo(iarr);
Py_END_ALLOW_THREADS
}
else
@@ -3046,16 +3222,11 @@ public:
%End
};
</pre>
-<p>As the example is a virtual method <a class="footnote-reference" href="#id16" id="id15" name="id15">[7]</a>, note the use of <tt class="docutils literal"><span class="pre">sipSelfWasArg</span></tt> to
+<p>As the example is a virtual method <a class="footnote-reference" href="#id16" id="id15" name="id15">[7]</a>, note the use of an explicit scope to
determine exactly which implementation of <tt class="docutils literal"><span class="pre">foo()</span></tt> to call.</p>
<p>If a method is in the <tt class="docutils literal"><span class="pre">protected</span></tt> section of a C++ class then the call
should instead be:</p>
<pre class="literal-block">
-sipRes = sipCpp -> sipProtectVirt_foo(sipSelfWasArg, iarr);
-</pre>
-<p>If a method is in the <tt class="docutils literal"><span class="pre">protected</span></tt> section of a C++ class but is not virtual
-then the call should instead be:</p>
-<pre class="literal-block">
sipRes = sipCpp -> sipProtect_foo(iarr);
</pre>
<table class="docutils footnote" frame="void" id="id16" rules="none">
@@ -3067,7 +3238,7 @@ handles the reimplementation of C++ virtual methods in Python.</td></tr>
</table>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id96" id="module" name="module">7.28 %Module</a></h2>
+<h2><a class="toc-backref" href="#id102" id="module" name="module">7.31 %Module</a></h2>
<pre class="literal-block">
%Module <em>name</em> [<em>version</em>]
</pre>
@@ -3092,7 +3263,7 @@ version number anyway.</p>
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id97" id="modulecode" name="modulecode">7.29 %ModuleCode</a></h2>
+<h2><a class="toc-backref" href="#id103" id="modulecode" name="modulecode">7.32 %ModuleCode</a></h2>
<pre class="literal-block">
%ModuleCode
<em>code</em>
@@ -3115,7 +3286,7 @@ void dump_object(PyObject *o)
<p>See also <a class="reference" href="#exportedheadercode">%ExportedHeaderCode</a> and <a class="reference" href="#moduleheadercode">%ModuleHeaderCode</a>.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id98" id="moduleheadercode" name="moduleheadercode">7.30 %ModuleHeaderCode</a></h2>
+<h2><a class="toc-backref" href="#id104" id="moduleheadercode" name="moduleheadercode">7.33 %ModuleHeaderCode</a></h2>
<pre class="literal-block">
%ModuleHeaderCode
<em>code</em>
@@ -3133,7 +3304,7 @@ void dump_object(PyObject *o);
<p>See also <a class="reference" href="#exportedheadercode">%ExportedHeaderCode</a> and <a class="reference" href="#modulecode">%ModuleCode</a>.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id99" id="optionalinclude" name="optionalinclude">7.31 %OptionalInclude</a></h2>
+<h2><a class="toc-backref" href="#id105" id="optionalinclude" name="optionalinclude">7.34 %OptionalInclude</a></h2>
<pre class="literal-block">
%OptionalInclude <em>filename</em>
</pre>
@@ -3145,7 +3316,7 @@ silently continues processing if <em>filename</em> could not be opened.</p>
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id100" id="picklecode" name="picklecode">7.32 %PickleCode</a></h2>
+<h2><a class="toc-backref" href="#id106" id="picklecode" name="picklecode">7.35 %PickleCode</a></h2>
<pre class="literal-block">
%PickleCode
<em>code</em>
@@ -3184,7 +3355,7 @@ being pickled.</p>
handwritten code.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id101" id="platforms" name="platforms">7.33 %Platforms</a></h2>
+<h2><a class="toc-backref" href="#id107" id="platforms" name="platforms">7.36 %Platforms</a></h2>
<pre class="literal-block">
%Platforms {<em>name</em> <em>name</em> ...}
</pre>
@@ -3208,7 +3379,7 @@ void documented();
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id102" id="postinitialisationcode" name="postinitialisationcode">7.34 %PostInitialisationCode</a></h2>
+<h2><a class="toc-backref" href="#id108" id="postinitialisationcode" name="postinitialisationcode">7.37 %PostInitialisationCode</a></h2>
<pre class="literal-block">
%PostInitialisationCode
<em>code</em>
@@ -3232,7 +3403,7 @@ at the very end of the generated module initialisation code.</p>
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id103" id="preinitialisationcode" name="preinitialisationcode">7.35 %PreInitialisationCode</a></h2>
+<h2><a class="toc-backref" href="#id109" id="preinitialisationcode" name="preinitialisationcode">7.38 %PreInitialisationCode</a></h2>
<pre class="literal-block">
%PreInitialisationCode
<em>code</em>
@@ -3249,7 +3420,7 @@ at the very start of the generated module initialisation code.</p>
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id104" id="raisecode" name="raisecode">7.36 %RaiseCode</a></h2>
+<h2><a class="toc-backref" href="#id110" id="raisecode" name="raisecode">7.39 %RaiseCode</a></h2>
<pre class="literal-block">
%RaiseCode
<em>code</em>
@@ -3277,7 +3448,7 @@ reference is the same as the type defined in the <tt class="docutils literal"><s
<p>See the <a class="reference" href="#exception">%Exception</a> directive for an example.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id105" id="setcode" name="setcode">7.37 %SetCode</a></h2>
+<h2><a class="toc-backref" href="#id111" id="setcode" name="setcode">7.40 %SetCode</a></h2>
<pre class="literal-block">
%SetCode
<em>code</em>
@@ -3308,13 +3479,7 @@ PyTypeObject * or a sipWrapperType *.</dd>
<p>See the <a class="reference" href="#getcode">%GetCode</a> directive for an example.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id106" id="sipoptions" name="sipoptions">7.38 %SIPOptions</a></h2>
-<p>This directive sets one or more options that controls different aspects of
-SIP's behaviour. In this version all the available options are provided
-specifically to support PyQt and so are not documented.</p>
-</div>
-<div class="section">
-<h2><a class="toc-backref" href="#id107" id="timeline" name="timeline">7.39 %Timeline</a></h2>
+<h2><a class="toc-backref" href="#id112" id="timeline" name="timeline">7.41 %Timeline</a></h2>
<pre class="literal-block">
%Timeline {<em>name</em> <em>name</em> ...}
</pre>
@@ -3341,7 +3506,7 @@ void foo(int = 0);
libraries to be wrapped in the same module.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id108" id="typecode" name="typecode">7.40 %TypeCode</a></h2>
+<h2><a class="toc-backref" href="#id113" id="typecode" name="typecode">7.42 %TypeCode</a></h2>
<pre class="literal-block">
%TypeCode
<em>code</em>
@@ -3374,7 +3539,7 @@ clashes of function names within a module in case the SIP <tt class="docutils li
option is used.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id109" id="typeheadercode" name="typeheadercode">7.41 %TypeHeaderCode</a></h2>
+<h2><a class="toc-backref" href="#id114" id="typeheadercode" name="typeheadercode">7.43 %TypeHeaderCode</a></h2>
<pre class="literal-block">
%TypeHeaderCode
<em>code</em>
@@ -3398,7 +3563,7 @@ class Klass
</pre>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id110" id="unitcode" name="unitcode">7.42 %UnitCode</a></h2>
+<h2><a class="toc-backref" href="#id115" id="unitcode" name="unitcode">7.44 %UnitCode</a></h2>
<pre class="literal-block">
%UnitCode
<em>code</em>
@@ -3409,7 +3574,7 @@ start of a generated compilation unit (ie. C or C++ source file). It is
typically used to <tt class="docutils literal"><span class="pre">#include</span></tt> a C++ precompiled header file.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id111" id="virtualcatchercode" name="virtualcatchercode">7.43 %VirtualCatcherCode</a></h2>
+<h2><a class="toc-backref" href="#id116" id="virtualcatchercode" name="virtualcatchercode">7.45 %VirtualCatcherCode</a></h2>
<pre class="literal-block">
%VirtualCatcherCode
<em>code</em>
@@ -3502,7 +3667,7 @@ public:
</div>
</div>
<div class="section">
-<h1><a class="toc-backref" href="#id112" id="sip-annotations" name="sip-annotations">8 SIP Annotations</a></h1>
+<h1><a class="toc-backref" href="#id117" id="sip-annotations" name="sip-annotations">8 SIP Annotations</a></h1>
<p>In this section we describe each of the annotations that can be used in
specification files.</p>
<p>Annotations can either be argument annotations, class annotations, mapped type
@@ -3521,6 +3686,9 @@ format of the value. The name of an annotation and its value are separated by
<dt>name</dt>
<dd>The value is a name that is compatible with a C/C++ identifier. In some
cases the value is optional.</dd>
+<dt>dotted name</dt>
+<dd>The value is a name that is compatible with an identifier preceded by a
+Python scope.</dd>
<dt>string</dt>
<dd>The value is a double quoted string.</dd>
</dl>
@@ -3531,15 +3699,15 @@ void exec(QWidget * /Transfer/) /ReleaseGIL, PyName=call_exec/;
<p>Note that the current version of SIP does not complain about unknown
annotations, or annotations used out of their correct context.</p>
<div class="section">
-<h2><a class="toc-backref" href="#id113" id="argument-annotations" name="argument-annotations">8.1 Argument Annotations</a></h2>
+<h2><a class="toc-backref" href="#id118" id="argument-annotations" name="argument-annotations">8.1 Argument Annotations</a></h2>
<div class="section">
-<h3><a class="toc-backref" href="#id114" id="allownone" name="allownone">8.1.1 AllowNone</a></h3>
+<h3><a class="toc-backref" href="#id119" id="allownone" name="allownone">8.1.1 AllowNone</a></h3>
<p>This boolean annotation specifies that the value of the corresponding argument
(which should be either <a class="reference" href="#sip-pycallable">SIP_PYCALLABLE</a>, <a class="reference" href="#sip-pydict">SIP_PYDICT</a>, <a class="reference" href="#sip-pylist">SIP_PYLIST</a>,
<a class="reference" href="#sip-pyslice">SIP_PYSLICE</a>, <a class="reference" href="#sip-pytuple">SIP_PYTUPLE</a> or <a class="reference" href="#sip-pytype">SIP_PYTYPE</a>) may be <tt class="docutils literal"><span class="pre">None</span></tt>.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id115" id="array" name="array">8.1.2 Array</a></h3>
+<h3><a class="toc-backref" href="#id120" id="array" name="array">8.1.2 Array</a></h3>
<p>This boolean annotation specifies that the corresponding argument (which
should be either <tt class="docutils literal"><span class="pre">char</span> <span class="pre">*</span></tt> or <tt class="docutils literal"><span class="pre">unsigned</span> <span class="pre">char</span> <span class="pre">*</span></tt>) refers to an array
rather than a <tt class="docutils literal"><span class="pre">'\0'</span></tt> terminated string. There must be a corresponding
@@ -3547,7 +3715,7 @@ argument with the <a class="reference" href="#arraysize">ArraySize</a> annotatio
specified once in a list of arguments.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id116" id="arraysize" name="arraysize">8.1.3 ArraySize</a></h3>
+<h3><a class="toc-backref" href="#id121" id="arraysize" name="arraysize">8.1.3 ArraySize</a></h3>
<p>This boolean annotation specifies that the corresponding argument (which
should be either <tt class="docutils literal"><span class="pre">short</span></tt>, <tt class="docutils literal"><span class="pre">unsigned</span> <span class="pre">short</span></tt>, <tt class="docutils literal"><span class="pre">int</span></tt>, <tt class="docutils literal"><span class="pre">unsigned</span></tt>,
<tt class="docutils literal"><span class="pre">long</span></tt> or <tt class="docutils literal"><span class="pre">unsigned</span> <span class="pre">long</span></tt>) refers to the size of an array. There must be
@@ -3555,7 +3723,7 @@ a corresponding argument with the <a class="reference" href="#array">Array</a> a
may only be specified once in a list of arguments.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id117" id="constrained" name="constrained">8.1.4 Constrained</a></h3>
+<h3><a class="toc-backref" href="#id122" id="constrained" name="constrained">8.1.4 Constrained</a></h3>
<p>Python will automatically convert between certain compatible types. For
example, if a floating pointer number is expected and an integer supplied,
then the integer will be converted appropriately. This can cause problems
@@ -3584,7 +3752,7 @@ void foo(int);
</pre>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id118" id="getwrapper" name="getwrapper">8.1.5 GetWrapper</a></h3>
+<h3><a class="toc-backref" href="#id123" id="getwrapper" name="getwrapper">8.1.5 GetWrapper</a></h3>
<p>This boolean annotation is only ever used in conjunction with handwritten code
specified with the <a class="reference" href="#methodcode">%MethodCode</a> directive. It causes an extra variable to
be generated for the corresponding argument (which should be a wrapped C
@@ -3593,7 +3761,7 @@ wraps the argument.</p>
<p>See the <a class="reference" href="#methodcode">%MethodCode</a> directive for more detail.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id119" id="in" name="in">8.1.6 In</a></h3>
+<h3><a class="toc-backref" href="#id124" id="in" name="in">8.1.6 In</a></h3>
<p>This boolean annotation is used to specify that the corresponding argument
(which should be a pointer type) is used to pass a value to the function.</p>
<p>For pointers to wrapped C structures or C++ class instances, <tt class="docutils literal"><span class="pre">char</span> <span class="pre">*</span></tt> and
@@ -3604,7 +3772,7 @@ if required. The argument will be dereferenced to obtain the actual value.</p>
<p>Both <a class="reference" href="#in">In</a> and <a class="reference" href="#out">Out</a> may be specified for the same argument.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id120" id="out" name="out">8.1.7 Out</a></h3>
+<h3><a class="toc-backref" href="#id125" id="out" name="out">8.1.7 Out</a></h3>
<p>This boolean annotation is used to specify that the corresponding argument
(which should be a pointer type) is used by the function to return a value as
an element of a tuple.</p>
@@ -3616,7 +3784,7 @@ annotation is specified.</p>
<p>Both <a class="reference" href="#in">In</a> and <a class="reference" href="#out">Out</a> may be specified for the same argument.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id121" id="resultsize" name="resultsize">8.1.8 ResultSize</a></h3>
+<h3><a class="toc-backref" href="#id126" id="resultsize" name="resultsize">8.1.8 ResultSize</a></h3>
<p>This boolean annotation is used with functions or methods that return a
<tt class="docutils literal"><span class="pre">void</span> <span class="pre">*</span></tt> or <tt class="docutils literal"><span class="pre">const</span> <span class="pre">void</span> <span class="pre">*</span></tt>. It identifies an argument that defines the
size of the block of memory whose address is being returned. This allows the
@@ -3625,13 +3793,13 @@ protocol and allows the memory to be read and updated when wrapped by the
Python <tt class="docutils literal"><span class="pre">buffer()</span></tt> builtin.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id122" id="singleshot" name="singleshot">8.1.9 SingleShot</a></h3>
+<h3><a class="toc-backref" href="#id127" id="singleshot" name="singleshot">8.1.9 SingleShot</a></h3>
<p>This boolean annotation is used only with arguments of type <a class="reference" href="#sip-rxobj-con">SIP_RXOBJ_CON</a> to
specify that the signal connected to the slot will only ever be emitted once.
This prevents a certain class of memory leaks.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id123" id="transfer" name="transfer">8.1.10 Transfer</a></h3>
+<h3><a class="toc-backref" href="#id128" id="transfer" name="transfer">8.1.10 Transfer</a></h3>
<p>This boolean annotation is used to specify that ownership of the corresponding
argument (which should be a wrapped C structure or C++ class instance) is
transferred from Python to C++. In addition, if the argument is of a class
@@ -3641,7 +3809,7 @@ cyclic garbage collector.</p>
<p>See <a class="reference" href="#ownership-of-objects">Ownership of Objects</a> for more detail.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id124" id="transferback" name="transferback">8.1.11 TransferBack</a></h3>
+<h3><a class="toc-backref" href="#id129" id="transferback" name="transferback">8.1.11 TransferBack</a></h3>
<p>This boolean annotation is used to specify that ownership of the corresponding
argument (which should be a wrapped C structure or C++ class instance) is
transferred back to Python from C++. In addition, any association of the
@@ -3651,7 +3819,7 @@ removed.</p>
<p>See <a class="reference" href="#ownership-of-objects">Ownership of Objects</a> for more detail.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id125" id="transferthis" name="transferthis">8.1.12 TransferThis</a></h3>
+<h3><a class="toc-backref" href="#id130" id="transferthis" name="transferthis">8.1.12 TransferThis</a></h3>
<p>This boolean annotation is only used in C++ constructors or methods. In the
context of a constructor or factory method it specifies that ownership of the
instance being created is transferred from Python to C++ if the corresponding
@@ -3668,15 +3836,15 @@ transferred to last instance that is not <tt class="docutils literal"><span clas
</div>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id126" id="class-annotations" name="class-annotations">8.2 Class Annotations</a></h2>
+<h2><a class="toc-backref" href="#id131" id="class-annotations" name="class-annotations">8.2 Class Annotations</a></h2>
<div class="section">
-<h3><a class="toc-backref" href="#id127" id="abstract" name="abstract">8.2.1 Abstract</a></h3>
+<h3><a class="toc-backref" href="#id132" id="abstract" name="abstract">8.2.1 Abstract</a></h3>
<p>This boolean annotation is used to specify that the class has additional pure
virtual methods that have not been specified and so it cannot be instantiated
or sub-classed from Python.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id128" id="delaydtor" name="delaydtor">8.2.2 DelayDtor</a></h3>
+<h3><a class="toc-backref" href="#id133" id="delaydtor" name="delaydtor">8.2.2 DelayDtor</a></h3>
<p>This boolean annotation is used to specify that the class's destructor should
not be called until the Python interpreter exits. It would normally only be
applied to singleton classes.</p>
@@ -3713,46 +3881,60 @@ last one.</dd>
Python.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id129" id="deprecated" name="deprecated">8.2.3 Deprecated</a></h3>
+<h3><a class="toc-backref" href="#id134" id="deprecated" name="deprecated">8.2.3 Deprecated</a></h3>
<p>This boolean annotation is used to specify that the class is deprecated. It is
the equivalent of annotating all the class's constructors, function and methods
as being deprecated.</p>
<p>Note that this can also be used as a function annotation.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id130" id="external" name="external">8.2.4 External</a></h3>
+<h3><a class="toc-backref" href="#id135" id="external" name="external">8.2.4 External</a></h3>
<p>This boolean annotation is used to specify that the class is defined in another
module. Declarations of external classes are private to the module in which
they appear.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id131" id="nodefaultctors" name="nodefaultctors">8.2.5 NoDefaultCtors</a></h3>
+<h3><a class="toc-backref" href="#id136" id="metatype" name="metatype">8.2.5 Metatype</a></h3>
+<p>This dotted name annotation specifies the name of the Python type object (i.e.
+the value of the <tt class="docutils literal"><span class="pre">tp_name</span></tt> field) used as the meta-type used when creating
+the type object for this C structure or C++ type.</p>
+<p>See the section <a class="reference" href="#types-and-meta-types">Types and Meta-types</a> for more details.</p>
+</div>
+<div class="section">
+<h3><a class="toc-backref" href="#id137" id="nodefaultctors" name="nodefaultctors">8.2.6 NoDefaultCtors</a></h3>
<p>This boolean annotation is used to suppress the automatic generation of default
constructors for the class.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id132" id="pyname" name="pyname">8.2.6 PyName</a></h3>
+<h3><a class="toc-backref" href="#id138" id="pyname" name="pyname">8.2.7 PyName</a></h3>
<p>This name annotation specifies an alternative name for the class being wrapped
which is used when it is referred to from Python. It is required when a class
name is the same as a Python keyword. It may also be used to avoid name
clashes with other objects (e.g. enums, exceptions, functions) that have the
same name in the same C++ scope.</p>
</div>
+<div class="section">
+<h3><a class="toc-backref" href="#id139" id="supertype" name="supertype">8.2.8 Supertype</a></h3>
+<p>This dotted name annotation specifies the name of the Python type object (i.e.
+the value of the <tt class="docutils literal"><span class="pre">tp_name</span></tt> field) used as the super-type used when creating
+the type object for this C structure or C++ type.</p>
+<p>See the section <a class="reference" href="#types-and-meta-types">Types and Meta-types</a> for more details.</p>
+</div>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id133" id="mapped-type-annotations" name="mapped-type-annotations">8.3 Mapped Type Annotations</a></h2>
+<h2><a class="toc-backref" href="#id140" id="mapped-type-annotations" name="mapped-type-annotations">8.3 Mapped Type Annotations</a></h2>
<div class="section">
-<h3><a class="toc-backref" href="#id134" id="norelease" name="norelease">8.3.1 NoRelease</a></h3>
+<h3><a class="toc-backref" href="#id141" id="norelease" name="norelease">8.3.1 NoRelease</a></h3>
<p>This boolean annotation is used to specify that the mapped type does not
-support the <a class="reference" href="#sipreleasemappedtype">sipReleaseMappedType()</a> function. Any <a class="reference" href="#converttotypecode">%ConvertToTypeCode</a>
-should not create temporary instances of the mapped type, i.e. it should not
-return <tt class="docutils literal"><span class="pre">SIP_TEMPORARY</span></tt>.</p>
+support the <a class="reference" href="#sipreleasetype">sipReleaseType()</a> function. Any <a class="reference" href="#converttotypecode">%ConvertToTypeCode</a> should not
+create temporary instances of the mapped type, i.e. it should not return
+<tt class="docutils literal"><span class="pre">SIP_TEMPORARY</span></tt>.</p>
</div>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id135" id="enum-annotations" name="enum-annotations">8.4 Enum Annotations</a></h2>
+<h2><a class="toc-backref" href="#id142" id="enum-annotations" name="enum-annotations">8.4 Enum Annotations</a></h2>
<div class="section">
-<h3><a class="toc-backref" href="#id136" id="id17" name="id17">8.4.1 PyName</a></h3>
+<h3><a class="toc-backref" href="#id143" id="id17" name="id17">8.4.1 PyName</a></h3>
<p>This name annotation specifies an alternative name for the enum or enum member
being wrapped which is used when it is referred to from Python. It is required
when an enum or enum member name is the same as a Python keyword. It may also
@@ -3761,9 +3943,9 @@ functions) that have the same name in the same C++ scope.</p>
</div>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id137" id="exception-annotations" name="exception-annotations">8.5 Exception Annotations</a></h2>
+<h2><a class="toc-backref" href="#id144" id="exception-annotations" name="exception-annotations">8.5 Exception Annotations</a></h2>
<div class="section">
-<h3><a class="toc-backref" href="#id138" id="id18" name="id18">8.5.1 PyName</a></h3>
+<h3><a class="toc-backref" href="#id145" id="id18" name="id18">8.5.1 PyName</a></h3>
<p>This name annotation specifies an alternative name for the exception being
defined which is used when it is referred to from Python. It is required when
an exception name is the same as a Python keyword. It may also be used to
@@ -3772,16 +3954,16 @@ have the same name.</p>
</div>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id139" id="function-annotations" name="function-annotations">8.6 Function Annotations</a></h2>
+<h2><a class="toc-backref" href="#id146" id="function-annotations" name="function-annotations">8.6 Function Annotations</a></h2>
<div class="section">
-<h3><a class="toc-backref" href="#id140" id="autogen" name="autogen">8.6.1 AutoGen</a></h3>
+<h3><a class="toc-backref" href="#id147" id="autogen" name="autogen">8.6.1 AutoGen</a></h3>
<p>This optional name annotation is used with class methods to specify that the
method be automatically included in all sub-classes. The value is the name of
a feature (specified using the <a class="reference" href="#feature">%Feature</a> directive) which must be enabled
for the method to be generated.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id141" id="default" name="default">8.6.2 Default</a></h3>
+<h3><a class="toc-backref" href="#id148" id="default" name="default">8.6.2 Default</a></h3>
<p>This boolean annotation is only used with C++ constructors. Sometimes SIP
needs to create a class instance. By default it uses a constructor with no
compulsory arguments if one is specified. (SIP will automatically generate a
@@ -3790,36 +3972,36 @@ annotation is used to explicitly specify which constructor to use. Zero is
passed as the value of any arguments to the constructor.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id142" id="id19" name="id19">8.6.3 Deprecated</a></h3>
+<h3><a class="toc-backref" href="#id149" id="id19" name="id19">8.6.3 Deprecated</a></h3>
<p>This boolean annotation is used to specify that the constructor or function is
deprecated. A deprecation warning is issued whenever the constructor or
function is called.</p>
<p>Note that this can also be used as a class annotation.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id143" id="factory" name="factory">8.6.4 Factory</a></h3>
+<h3><a class="toc-backref" href="#id150" id="factory" name="factory">8.6.4 Factory</a></h3>
<p>This boolean annotation specifies that the value returned by the function
(which should be a wrapped C structure or C++ class instance) is a newly
created instance and is owned by Python.</p>
<p>See <a class="reference" href="#ownership-of-objects">Ownership of Objects</a> for more detail.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id144" id="holdgil" name="holdgil">8.6.5 HoldGIL</a></h3>
+<h3><a class="toc-backref" href="#id151" id="holdgil" name="holdgil">8.6.5 HoldGIL</a></h3>
<p>This boolean annotation specifies that the Python Global Interpreter Lock (GIL)
is not released before the call to the underlying C or C++ function. See
<a class="reference" href="#the-python-global-interpreter-lock">The Python Global Interpreter Lock</a> and the <a class="reference" href="#releasegil">ReleaseGIL</a> annotation.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id145" id="newthread" name="newthread">8.6.6 NewThread</a></h3>
+<h3><a class="toc-backref" href="#id152" id="newthread" name="newthread">8.6.6 NewThread</a></h3>
<p>This boolean annotation specifies that the function will create a new thread.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id146" id="noargparser" name="noargparser">8.6.7 NoArgParser</a></h3>
+<h3><a class="toc-backref" href="#id153" id="noargparser" name="noargparser">8.6.7 NoArgParser</a></h3>
<p>This boolean annotation is used with global functions to specify that the
supplied <a class="reference" href="#methodcode">%MethodCode</a> will handle the parsing of the arguments.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id147" id="noderived" name="noderived">8.6.8 NoDerived</a></h3>
+<h3><a class="toc-backref" href="#id154" id="noderived" name="noderived">8.6.8 NoDerived</a></h3>
<p>This boolean annotation is only used with C++ constructors. In many cases SIP
generates a derived class for each class being wrapped (see <a class="reference" href="#generated-derived-classes">Generated Derived
Classes</a>). This derived class contains constructors with the same C++
@@ -3828,7 +4010,7 @@ Python constructor that has no corresponding C++ constructor. This annotation
is used to suppress the generation of the constructor in the derived class.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id148" id="numeric" name="numeric">8.6.9 Numeric</a></h3>
+<h3><a class="toc-backref" href="#id155" id="numeric" name="numeric">8.6.9 Numeric</a></h3>
<p>This boolean annotation specifies that the operator should be interpreted as a
numeric operator rather than a sequence operator. Python uses the <tt class="docutils literal"><span class="pre">+</span></tt>
operator for adding numbers and concatanating sequences, and the <tt class="docutils literal"><span class="pre">*</span></tt> operator
@@ -3842,21 +4024,21 @@ operators. This annotation is used to force SIP to treat the operator as
numeric.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id149" id="posthook" name="posthook">8.6.10 PostHook</a></h3>
+<h3><a class="toc-backref" href="#id156" id="posthook" name="posthook">8.6.10 PostHook</a></h3>
<p>This name annotation is used to specify the name of a Python builtin that is
called immediately after the call to the underlying C or C++ function or any
handwritten code. The builtin is not called if an error occurred. It is
primarily used to integrate with debuggers.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id150" id="prehook" name="prehook">8.6.11 PreHook</a></h3>
+<h3><a class="toc-backref" href="#id157" id="prehook" name="prehook">8.6.11 PreHook</a></h3>
<p>This name annotation is used to specify the name of a Python builtin that is
called immediately after the function's arguments have been successfully
parsed and before the call to the underlying C or C++ function or any
handwritten code. It is primarily used to integrate with debuggers.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id151" id="id20" name="id20">8.6.12 PyName</a></h3>
+<h3><a class="toc-backref" href="#id158" id="id20" name="id20">8.6.12 PyName</a></h3>
<p>This name annotation specifies an alternative name for the function being
wrapped which is used when it is referred to from Python. It is required when
a function or method name is the same as a Python keyword. It may also be used
@@ -3864,7 +4046,7 @@ to avoid name clashes with other objects (e.g. classes, enums, exceptions) that
have the same name in the same C++ scope.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id152" id="releasegil" name="releasegil">8.6.13 ReleaseGIL</a></h3>
+<h3><a class="toc-backref" href="#id159" id="releasegil" name="releasegil">8.6.13 ReleaseGIL</a></h3>
<p>This boolean annotation specifies that the Python Global Interpreter Lock (GIL)
is released before the call to the underlying C or C++ function and reacquired
afterwards. It should be used for functions that might block or take a
@@ -3872,7 +4054,7 @@ significant amount of time to execute. See <a class="reference" href="#the-pyth
Lock</a> and the <a class="reference" href="#holdgil">HoldGIL</a> annotation.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id153" id="id21" name="id21">8.6.14 Transfer</a></h3>
+<h3><a class="toc-backref" href="#id160" id="id21" name="id21">8.6.14 Transfer</a></h3>
<p>This boolean annotation specifies that ownership of the value returned by the
function (which should be a wrapped C structure or C++ class instance) is
transferred to C++. It is only used in the context of a class constructor or a
@@ -3885,7 +4067,7 @@ the method is created with regard to the cyclic garbage collector.</p>
<p>See <a class="reference" href="#ownership-of-objects">Ownership of Objects</a> for more detail.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id154" id="id22" name="id22">8.6.15 TransferBack</a></h3>
+<h3><a class="toc-backref" href="#id161" id="id22" name="id22">8.6.15 TransferBack</a></h3>
<p>This boolean annotation specifies that ownership of the value returned by the
function (which should be a wrapped C structure or C++ class instance) is
transferred back to Python from C++. Normally returned values (unless they are
@@ -3896,7 +4078,7 @@ with another instance is removed.</p>
<p>See <a class="reference" href="#ownership-of-objects">Ownership of Objects</a> for more detail.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id155" id="id23" name="id23">8.6.16 TransferThis</a></h3>
+<h3><a class="toc-backref" href="#id162" id="id23" name="id23">8.6.16 TransferThis</a></h3>
<p>This boolean annotation specifies that ownership of <tt class="docutils literal"><span class="pre">this</span></tt> is transferred
from Python to C++.</p>
<p>Note that this can also be used as an argument annotation.</p>
@@ -3904,36 +4086,36 @@ from Python to C++.</p>
</div>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id156" id="license-annotations" name="license-annotations">8.7 License Annotations</a></h2>
+<h2><a class="toc-backref" href="#id163" id="license-annotations" name="license-annotations">8.7 License Annotations</a></h2>
<div class="section">
-<h3><a class="toc-backref" href="#id157" id="licensee" name="licensee">8.7.1 Licensee</a></h3>
+<h3><a class="toc-backref" href="#id164" id="licensee" name="licensee">8.7.1 Licensee</a></h3>
<p>This optional string annotation specifies the license's licensee. No
restrictions are placed on the contents of the string.</p>
<p>See the <a class="reference" href="#id14">%License</a> directive.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id158" id="signature" name="signature">8.7.2 Signature</a></h3>
+<h3><a class="toc-backref" href="#id165" id="signature" name="signature">8.7.2 Signature</a></h3>
<p>This optional string annotation specifies the license's signature. No
restrictions are placed on the contents of the string.</p>
<p>See the <a class="reference" href="#id14">%License</a> directive.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id159" id="timestamp" name="timestamp">8.7.3 Timestamp</a></h3>
+<h3><a class="toc-backref" href="#id166" id="timestamp" name="timestamp">8.7.3 Timestamp</a></h3>
<p>This optional string annotation specifies the license's timestamp. No
restrictions are placed on the contents of the string.</p>
<p>See the <a class="reference" href="#id14">%License</a> directive.</p>
</div>
<div class="section">
-<h3><a class="toc-backref" href="#id160" id="type" name="type">8.7.4 Type</a></h3>
+<h3><a class="toc-backref" href="#id167" id="type" name="type">8.7.4 Type</a></h3>
<p>This string annotation specifies the license's type. No restrictions are
placed on the contents of the string.</p>
<p>See the <a class="reference" href="#id14">%License</a> directive.</p>
</div>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id161" id="typedef-annotations" name="typedef-annotations">8.8 Typedef Annotations</a></h2>
+<h2><a class="toc-backref" href="#id168" id="typedef-annotations" name="typedef-annotations">8.8 Typedef Annotations</a></h2>
<div class="section">
-<h3><a class="toc-backref" href="#id162" id="notypename" name="notypename">8.8.1 NoTypeName</a></h3>
+<h3><a class="toc-backref" href="#id169" id="notypename" name="notypename">8.8.1 NoTypeName</a></h3>
<p>This boolean annotation specifies that the definition of the type rather than
the name of the type being defined should be used in the generated code.</p>
<p>Normally a typedef would be defined as follows:</p>
@@ -3946,9 +4128,9 @@ code instead.</p>
</div>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id163" id="variable-annotations" name="variable-annotations">8.9 Variable Annotations</a></h2>
+<h2><a class="toc-backref" href="#id170" id="variable-annotations" name="variable-annotations">8.9 Variable Annotations</a></h2>
<div class="section">
-<h3><a class="toc-backref" href="#id164" id="id24" name="id24">8.9.1 PyName</a></h3>
+<h3><a class="toc-backref" href="#id171" id="id24" name="id24">8.9.1 PyName</a></h3>
<p>This name annotation specifies an alternative name for the variable being
wrapped which is used when it is referred to from Python. It is required when
a variable name is the same as a Python keyword. It may also be used to avoid
@@ -3958,53 +4140,53 @@ name in the same C++ scope.</p>
</div>
</div>
<div class="section">
-<h1><a class="toc-backref" href="#id165" id="sip-api-for-handwritten-code" name="sip-api-for-handwritten-code">9 SIP API for Handwritten Code</a></h1>
+<h1><a class="toc-backref" href="#id172" id="sip-api-for-handwritten-code" name="sip-api-for-handwritten-code">9 SIP API for Handwritten Code</a></h1>
<p>In this section we describe the API that can be used by handwritten code in
specification files.</p>
<div class="section">
-<h2><a class="toc-backref" href="#id166" id="sip-api-major-nr" name="sip-api-major-nr">9.1 SIP_API_MAJOR_NR</a></h2>
+<h2><a class="toc-backref" href="#id173" id="sip-api-major-nr" name="sip-api-major-nr">9.1 SIP_API_MAJOR_NR</a></h2>
<p>This is a C preprocessor symbol that defines the major number of the SIP API.
Its value is a number. There is no direct relationship between this and the
SIP version number.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id167" id="sip-api-minor-nr" name="sip-api-minor-nr">9.2 SIP_API_MINOR_NR</a></h2>
+<h2><a class="toc-backref" href="#id174" id="sip-api-minor-nr" name="sip-api-minor-nr">9.2 SIP_API_MINOR_NR</a></h2>
<p>This is a C preprocessor symbol that defines the minor number of the SIP API.
Its value is a number. There is no direct relationship between this and the
SIP version number.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id168" id="sip-block-threads" name="sip-block-threads">9.3 SIP_BLOCK_THREADS</a></h2>
+<h2><a class="toc-backref" href="#id175" id="sip-block-threads" name="sip-block-threads">9.3 SIP_BLOCK_THREADS</a></h2>
<p>This is a C preprocessor macro that will make sure the Python Global
Interpreter Lock (GIL) is acquired. Python API calls must only be made when
the GIL has been acquired. There must be a corresponding
<a class="reference" href="#sip-unblock-threads">SIP_UNBLOCK_THREADS</a> at the same lexical scope.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id169" id="sip-ssize-t" name="sip-ssize-t">9.4 SIP_SSIZE_T</a></h2>
+<h2><a class="toc-backref" href="#id176" id="sip-ssize-t" name="sip-ssize-t">9.4 SIP_SSIZE_T</a></h2>
<p>This is a C preprocessor macro that is defined as <tt class="docutils literal"><span class="pre">Py_ssize_t</span></tt> for Python
v2.5 and later, and as <tt class="docutils literal"><span class="pre">int</span></tt> for earlier versions of Python. It makes it
easier to write PEP 353 compliant handwritten code.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id170" id="sip-unblock-threads" name="sip-unblock-threads">9.5 SIP_UNBLOCK_THREADS</a></h2>
+<h2><a class="toc-backref" href="#id177" id="sip-unblock-threads" name="sip-unblock-threads">9.5 SIP_UNBLOCK_THREADS</a></h2>
<p>This is a C preprocessor macro that will restore the Python Global Interpreter
Lock (GIL) to the state it was prior to the corresponding <a class="reference" href="#sip-block-threads">SIP_BLOCK_THREADS</a>.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id171" id="sip-version" name="sip-version">9.6 SIP_VERSION</a></h2>
+<h2><a class="toc-backref" href="#id178" id="sip-version" name="sip-version">9.6 SIP_VERSION</a></h2>
<p>This is a C preprocessor symbol that defines the SIP version number
represented as a 3 part hexadecimal number (e.g. v4.0.0 is represented as
<tt class="docutils literal"><span class="pre">0x040000</span></tt>).</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id172" id="sip-version-str" name="sip-version-str">9.7 SIP_VERSION_STR</a></h2>
+<h2><a class="toc-backref" href="#id179" id="sip-version-str" name="sip-version-str">9.7 SIP_VERSION_STR</a></h2>
<p>This is a C preprocessor symbol that defines the SIP version number
represented as a string. For development snapshots it will start with
<tt class="docutils literal"><span class="pre">snapshot-</span></tt>.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id173" id="sipbadcatcherresult" name="sipbadcatcherresult">9.8 sipBadCatcherResult()</a></h2>
+<h2><a class="toc-backref" href="#id180" id="sipbadcatcherresult" name="sipbadcatcherresult">9.8 sipBadCatcherResult()</a></h2>
<dl class="docutils">
<dt>void sipBadCatcherResult(PyObject *method)</dt>
<dd>This raises a Python exception when the result of a Python reimplementation
@@ -4015,7 +4197,7 @@ handwritten code specified with the <a class="reference" href="#virtualcatcherco
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id174" id="sipbadlengthforslice" name="sipbadlengthforslice">9.9 sipBadLengthForSlice()</a></h2>
+<h2><a class="toc-backref" href="#id181" id="sipbadlengthforslice" name="sipbadlengthforslice">9.9 sipBadLengthForSlice()</a></h2>
<dl class="docutils">
<dt>void sipBadLengthForSlice(SIP_SSIZE_T seqlen, SIP_SSIZE_T slicelen)</dt>
<dd>This raises a Python exception when the length of a slice object is
@@ -4026,7 +4208,7 @@ versions of Python prior to v2.5 the arguments have type <tt class="docutils lit
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id175" id="sipbuildresult" name="sipbuildresult">9.10 sipBuildResult()</a></h2>
+<h2><a class="toc-backref" href="#id182" id="sipbuildresult" name="sipbuildresult">9.10 sipBuildResult()</a></h2>
<dl class="docutils">
<dt>PyObject *sipBuildResult(int *iserr, const char *format, ...)</dt>
<dd><p class="first">This creates a Python object based on a format string and associated
@@ -4042,10 +4224,6 @@ entry in parentheses is the Python object type that the format character
will create, and the entry in brackets are the types of the C/C++ values
to be passed.</p>
<dl class="last docutils">
-<dt><tt class="docutils literal"><span class="pre">a</span></tt> (string) [char *, int]</dt>
-<dd>Convert a C/C++ character array and its length to a Python string. If
-the array is <tt class="docutils literal"><span class="pre">NULL</span></tt> then the length is ignored and the result is
-<tt class="docutils literal"><span class="pre">Py_None</span></tt>. This is deprecated, use <tt class="docutils literal"><span class="pre">g</span></tt> instead.</dd>
<dt><tt class="docutils literal"><span class="pre">b</span></tt> (boolean) [int]</dt>
<dd>Convert a C/C++ <tt class="docutils literal"><span class="pre">int</span></tt> to a Python boolean.</dd>
<dt><tt class="docutils literal"><span class="pre">c</span></tt> (string) [char]</dt>
@@ -4085,21 +4263,19 @@ string pointer is <tt class="docutils literal"><span class="pre">NULL</span></tt
<dd>Convert a C/C++ <tt class="docutils literal"><span class="pre">L'\0'</span></tt> terminated wide character string to a Python
unicode object. If the string pointer is <tt class="docutils literal"><span class="pre">NULL</span></tt> then the result is
<tt class="docutils literal"><span class="pre">Py_None</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">A</span></tt> (unicode) [wchar_t *, int]</dt>
-<dd>Convert a C/C++ wide character array and its length to a Python unicode
-object. If the array is <tt class="docutils literal"><span class="pre">NULL</span></tt> then the length is ignored and the
-result is <tt class="docutils literal"><span class="pre">Py_None</span></tt>. This is deprecated, use <tt class="docutils literal"><span class="pre">G</span></tt> instead.</dd>
<dt><tt class="docutils literal"><span class="pre">B</span></tt> (wrapped instance) [<em>type</em> *, sipWrapperType *, PyObject *]</dt>
-<dd>Convert a new C structure or a new C++ class instance to a Python class
+<dd><p class="first">Convert a new C structure or a new C++ class instance to a Python class
instance object. Ownership of the structure or instance is determined
by the <tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> argument. If it is <tt class="docutils literal"><span class="pre">NULL</span></tt> and the instance has
already been wrapped then the ownership is unchanged. If it is
<tt class="docutils literal"><span class="pre">NULL</span></tt> or <tt class="docutils literal"><span class="pre">Py_None</span></tt> then ownership will be with Python. Otherwise
ownership will be with C/C++ and the instance associated with the
<tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> argument. The Python class is influenced by any
-applicable <a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code.</dd>
+applicable <a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code.</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use <tt class="docutils literal"><span class="pre">N</span></tt>.</p>
+</dd>
<dt><tt class="docutils literal"><span class="pre">C</span></tt> (wrapped instance) [<em>type</em> *, sipWrapperType *, PyObject *]</dt>
-<dd>Convert a C structure or a C++ class instance to a Python class
+<dd><p class="first">Convert a C structure or a C++ class instance to a Python class
instance object. If the structure or class instance has already been
wrapped then the result is a new reference to the existing class
instance object. Ownership of the structure or instance is determined
@@ -4110,59 +4286,48 @@ C/C++. If it is <tt class="docutils literal"><span class="pre">Py_None</span></
via a call to <a class="reference" href="#siptransferback">sipTransferBack()</a>. Otherwise ownership is transferred
to C/C++ and the instance associated with the <tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> argument
via a call to <a class="reference" href="#siptransferto">sipTransferTo()</a>. The Python class is influenced by
-any applicable <a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code.</dd>
-<dt><tt class="docutils literal"><span class="pre">D</span></tt> (object) [<em>type</em> *, const sipMappedType *, PyObject *]</dt>
-<dd>Convert a C structure or a C++ class instance wrapped as a mapped type
-to a Python object. Ownership of the structure or instance is
-determined by the <tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> argument. If it is <tt class="docutils literal"><span class="pre">NULL</span></tt> then the
-ownership is unchanged. If it is <tt class="docutils literal"><span class="pre">Py_None</span></tt> then ownership is
-transferred to Python via a call to <a class="reference" href="#siptransferback">sipTransferBack()</a>. Otherwise
-ownership is transferred to C/C++ and the instance associated with the
-<tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> argument via a call to <a class="reference" href="#siptransferto">sipTransferTo()</a>.</dd>
+any applicable <a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code.</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use <tt class="docutils literal"><span class="pre">D</span></tt>.</p>
+</dd>
+<dt><tt class="docutils literal"><span class="pre">D</span></tt> (wrapped instance) [<em>type</em> *, const sipTypeDef *, PyObject *]</dt>
+<dd>Convert a C structure, C++ class or mapped type instance to a Python
+object. If the instance has already been wrapped then the result is a
+new reference to the existing object. Ownership of the instance is
+determined by the <tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> argument. If it is <tt class="docutils literal"><span class="pre">NULL</span></tt> and the
+instance has already been wrapped then the ownership is unchanged. If
+it is <tt class="docutils literal"><span class="pre">NULL</span></tt> and the instance is newly wrapped then ownership will be
+with C/C++. If it is <tt class="docutils literal"><span class="pre">Py_None</span></tt> then ownership is transferred to
+Python via a call to <a class="reference" href="#siptransferback">sipTransferBack()</a>. Otherwise ownership is
+transferred to C/C++ and the instance associated with the
+<tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> argument via a call to <a class="reference" href="#siptransferto">sipTransferTo()</a>. The Python
+class is influenced by any applicable <a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code.</dd>
<dt><tt class="docutils literal"><span class="pre">E</span></tt> (wrapped enum) [enum, PyTypeObject *]</dt>
+<dd><p class="first">Convert a named C/C++ <tt class="docutils literal"><span class="pre">enum</span></tt> to an instance of the corresponding
+Python named enum type.</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use <tt class="docutils literal"><span class="pre">F</span></tt>.</p>
+</dd>
+<dt><tt class="docutils literal"><span class="pre">F</span></tt> (wrapped enum) [enum, sipTypeDef *]</dt>
<dd>Convert a named C/C++ <tt class="docutils literal"><span class="pre">enum</span></tt> to an instance of the corresponding
Python named enum type.</dd>
<dt><tt class="docutils literal"><span class="pre">G</span></tt> (unicode) [wchar_t *, SIP_SSIZE_T]</dt>
<dd>Convert a C/C++ wide character array and its length to a Python unicode
object. If the array is <tt class="docutils literal"><span class="pre">NULL</span></tt> then the length is ignored and the
result is <tt class="docutils literal"><span class="pre">Py_None</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">M</span></tt> (wrapped instance) [<em>type</em> *, sipWrapperType *]</dt>
-<dd>Convert a C structure or a C++ class instance to a Python class
-instance object. If the structure or class instance has already been
-wrapped then the result is a new reference to the existing class
-instance object. If the instance has already been wrapped then the
-ownership is unchanged. If the instance is newly wrapped then
-ownership will be with C/C++. The Python class is influenced by any
-applicable <a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code. This is deprecated from
-SIP v4.4.</dd>
-<dt><tt class="docutils literal"><span class="pre">N</span></tt> (wrapped instance) [<em>type</em> *, sipWrapperType *]</dt>
-<dd>Convert a C structure or a C++ class instance to a Python class
-instance object. This should not be used if the structure or class
-instance might already have been wrapped. Ownership of the structure
-or instance will be with Python. The Python class is influenced by
-any applicable <a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code. This is deprecated
-from SIP v4.4.</dd>
-<dt><tt class="docutils literal"><span class="pre">O</span></tt> (wrapped instance) [<em>type</em> *, sipWrapperType *]</dt>
-<dd>Convert a C structure or a C++ class instance to a Python class
-instance object. If the structure or class instance has already been
-wrapped then the result is a new reference to the existing class
-instance object. Ownership of the structure or instance will be with
-C/C++. This is deprecated from SIP v4.4.</dd>
-<dt><tt class="docutils literal"><span class="pre">P</span></tt> (wrapped instance) [<em>type</em> *, sipWrapperType *]</dt>
-<dd>Convert a C structure or a C++ class instance to a Python class
-instance object. This should not be used if the structure or class
-instance might already have been wrapped. Ownership of the structure
-or instance will be with Python. This is deprecated from SIP v4.4.</dd>
+<dt><tt class="docutils literal"><span class="pre">N</span></tt> (wrapped instance) [<em>type</em> *, sipTypeDef *, PyObject *]</dt>
+<dd>Convert a new C structure, C++ class or mapped type instance to a
+Python object. Ownership of the instance is determined by the
+<tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> argument. If it is <tt class="docutils literal"><span class="pre">NULL</span></tt> and the instance has
+already been wrapped then the ownership is unchanged. If it is
+<tt class="docutils literal"><span class="pre">NULL</span></tt> or <tt class="docutils literal"><span class="pre">Py_None</span></tt> then ownership will be with Python. Otherwise
+ownership will be with C/C++ and the instance associated with the
+<tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> argument. The Python class is influenced by any
+applicable <a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code.</dd>
<dt><tt class="docutils literal"><span class="pre">R</span></tt> (object) [PyObject *]</dt>
<dd>The result is value passed without any conversions. The reference
count is unaffected, i.e. a reference is taken.</dd>
<dt><tt class="docutils literal"><span class="pre">S</span></tt> (object) [PyObject *]</dt>
<dd>The result is value passed without any conversions. The reference
count is incremented.</dd>
-<dt><tt class="docutils literal"><span class="pre">T</span></tt> (object) [void *, PyObject *(*)(void *cppptr)]</dt>
-<dd>Convert a C structure or a C++ class instance to a Python object using
-a convertor function. See <a class="reference" href="#generated-type-convertors">Generated Type Convertors</a>. This is
-deprecated from SIP v4.4.</dd>
<dt><tt class="docutils literal"><span class="pre">V</span></tt> (sip.voidptr) [void *]</dt>
<dd>Convert a C/C++ <tt class="docutils literal"><span class="pre">void</span> <span class="pre">*</span></tt> Python <tt class="docutils literal"><span class="pre">sip.voidptr</span></tt> object.</dd>
</dl>
@@ -4170,7 +4335,7 @@ deprecated from SIP v4.4.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id176" id="sipcallmethod" name="sipcallmethod">9.11 sipCallMethod()</a></h2>
+<h2><a class="toc-backref" href="#id183" id="sipcallmethod" name="sipcallmethod">9.11 sipCallMethod()</a></h2>
<dl class="docutils">
<dt>PyObject *sipCallMethod(int *iserr, PyObject *method, const char *format, ...)</dt>
<dd><p class="first">This calls a Python method passing a tuple of arguments based on a format
@@ -4187,7 +4352,7 @@ Python bound method to call. <em>format</em> is the string of format characters
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id177" id="sipcanconverttoinstance" name="sipcanconverttoinstance">9.12 sipCanConvertToInstance()</a></h2>
+<h2><a class="toc-backref" href="#id184" id="sipcanconverttoinstance" name="sipcanconverttoinstance">9.12 sipCanConvertToInstance()</a></h2>
<dl class="docutils">
<dt>int sipCanConvertToInstance(PyObject *obj, sipWrapperType *type, int flags)</dt>
<dd><p class="first">This returns a non-zero value if a Python object can be converted to an
@@ -4195,18 +4360,20 @@ instance of a C structure or C++ class. <em>obj</em> is the Python object.
<em>type</em> is the generated type corresponding to the C/C++ type being checked.
<em>flags</em> is any combination of the following values used to fine tune the
check.</p>
-<blockquote class="last">
+<blockquote>
<ul class="simple">
<li><tt class="docutils literal"><span class="pre">SIP_NOT_NONE</span></tt> causes the check to fail if <em>obj</em> is <tt class="docutils literal"><span class="pre">None</span></tt>.</li>
<li><tt class="docutils literal"><span class="pre">SIP_NO_CONVERTORS</span></tt> suppresses the use of of any
<a class="reference" href="#converttotypecode">%ConvertToTypeCode</a> for <em>type</em>.</li>
</ul>
</blockquote>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use
+<a class="reference" href="#sipcanconverttotype">sipCanConvertToType()</a>.</p>
</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id178" id="sipcanconverttomappedtype" name="sipcanconverttomappedtype">9.13 sipCanConvertToMappedType()</a></h2>
+<h2><a class="toc-backref" href="#id185" id="sipcanconverttomappedtype" name="sipcanconverttomappedtype">9.13 sipCanConvertToMappedType()</a></h2>
<dl class="docutils">
<dt>int sipCanConvertToMappedType(PyObject *obj, const sipMappedType *mt, int flags)</dt>
<dd><p class="first">This returns a non-zero value if a Python object can be converted to an
@@ -4214,40 +4381,50 @@ instance of a C structure or C++ class which has been implemented as a
mapped type. <em>obj</em> is the Python object. <em>mt</em> is an opaque structure
returned by <a class="reference" href="#sipfindmappedtype">sipFindMappedType()</a>. <em>flags</em> is any combination of the
following values used to fine tune the check.</p>
-<blockquote class="last">
+<blockquote>
<ul class="simple">
<li><tt class="docutils literal"><span class="pre">SIP_NOT_NONE</span></tt> causes the check to fail if <em>obj</em> is <tt class="docutils literal"><span class="pre">None</span></tt>.</li>
</ul>
</blockquote>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use
+<a class="reference" href="#sipcanconverttotype">sipCanConvertToType()</a>.</p>
</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id179" id="sipclassname" name="sipclassname">9.14 sipClassName()</a></h2>
+<h2><a class="toc-backref" href="#id186" id="sipcanconverttotype" name="sipcanconverttotype">9.14 sipCanConvertToType()</a></h2>
<dl class="docutils">
-<dt>PyObject *sipClassName(PyObject *obj)</dt>
-<dd>This returns the class name of a wrapped instance as a Python string. It
-comes with a reference.</dd>
+<dt>int sipCanConvertToType(PyObject *obj, const sipTypeDef *td, int flags)</dt>
+<dd><p class="first">This returns a non-zero value if a Python object can be converted to an
+instance of a C structure, C++ class or mapped type. <em>obj</em> is the Python
+object. <em>td</em> is the generated type structure corresponding to the C/C++
+type being checked. <em>flags</em> is any combination of the following values
+used to fine tune the check.</p>
+<blockquote class="last">
+<ul class="simple">
+<li><tt class="docutils literal"><span class="pre">SIP_NOT_NONE</span></tt> causes the check to fail if <em>obj</em> is <tt class="docutils literal"><span class="pre">None</span></tt>.</li>
+<li><tt class="docutils literal"><span class="pre">SIP_NO_CONVERTORS</span></tt> suppresses the use of of any
+<a class="reference" href="#converttotypecode">%ConvertToTypeCode</a> for <em>td</em>. It is ignored for mapped types.</li>
+</ul>
+</blockquote>
+</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id180" id="sipconnectrx" name="sipconnectrx">9.15 sipConnectRx()</a></h2>
+<h2><a class="toc-backref" href="#id187" id="sipclassname" name="sipclassname">9.15 sipClassName()</a></h2>
<dl class="docutils">
-<dt>PyObject *sipConnectRx(PyObject *sender, const char *signal, PyObject *receiver, const char *slot, int type)</dt>
-<dd>This connects a signal to a signal or slot and returns <tt class="docutils literal"><span class="pre">Py_True</span></tt> if the
-signal was connected or <tt class="docutils literal"><span class="pre">Py_False</span></tt> if not. If there was some other
-error then a Python exception is raised and <tt class="docutils literal"><span class="pre">NULL</span></tt> is returned. <em>sender</em>
-is the wrapped <tt class="docutils literal"><span class="pre">QObject</span></tt> derived instance that emits the signal.
-<em>signal</em> is the typed name of the signal. <em>receiver</em> is the wrapped
-<tt class="docutils literal"><span class="pre">QObject</span></tt> derived instance or Python callable that the signal is
-connected to. <em>slot</em> is the typed name of the slot, or <tt class="docutils literal"><span class="pre">NULL</span></tt> if
-<em>receiver</em> is a Python callable. <em>type</em> is the type of connection and is
-cast from Qt::ConnectionType. It is normally only used by PyQt to
-implement <tt class="docutils literal"><span class="pre">QObject.connect()</span></tt>.</dd>
+<dt>PyObject *sipClassName(PyObject *obj)</dt>
+<dd><p class="first">This returns the class name of a wrapped instance as a Python string. It
+comes with a reference.</p>
+<p>This is deprecated from SIP v4.8. Instead you should use the following:</p>
+<pre class="last literal-block">
+PyString_FromString(obj->ob_type->tp_name)
+</pre>
+</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id181" id="sipconvertfromconstvoidptr" name="sipconvertfromconstvoidptr">9.16 sipConvertFromConstVoidPtr()</a></h2>
+<h2><a class="toc-backref" href="#id188" id="sipconvertfromconstvoidptr" name="sipconvertfromconstvoidptr">9.16 sipConvertFromConstVoidPtr()</a></h2>
<dl class="docutils">
<dt>PyObject *sipConvertFromConstVoidPtr(const void *cpp)</dt>
<dd>This creates a <tt class="docutils literal"><span class="pre">sip.voidptr</span></tt> object for a memory address. The object
@@ -4256,7 +4433,7 @@ address.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id182" id="sipconvertfromconstvoidptrandsize" name="sipconvertfromconstvoidptrandsize">9.17 sipConvertFromConstVoidPtrAndSize()</a></h2>
+<h2><a class="toc-backref" href="#id189" id="sipconvertfromconstvoidptrandsize" name="sipconvertfromconstvoidptrandsize">9.17 sipConvertFromConstVoidPtrAndSize()</a></h2>
<dl class="docutils">
<dt>PyObject *sipConvertFromConstVoidPtrAndSize(const void *cpp, SIP_SSIZE_T size)</dt>
<dd>This creates a <tt class="docutils literal"><span class="pre">sip.voidptr</span></tt> object for a memory address. The object
@@ -4266,10 +4443,20 @@ object.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id183" id="sipconvertfrominstance" name="sipconvertfrominstance">9.18 sipConvertFromInstance()</a></h2>
+<h2><a class="toc-backref" href="#id190" id="sipconvertfromenum" name="sipconvertfromenum">9.18 sipConvertFromEnum()</a></h2>
+<dl class="docutils">
+<dt>PyObject *sipConvertFromEnum(int eval, const sipTypeDef *td)</dt>
+<dd>This converts a named C/C++ <tt class="docutils literal"><span class="pre">enum</span></tt> to an instance of the corresponding
+generated Python named enum type. <em>eval</em> is the enumerated value to
+convert. <em>td</em> is the generated Python type structure (see <a class="reference" href="#generated-type-structures">Generated Type
+Structures</a>).</dd>
+</dl>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id191" id="sipconvertfrominstance" name="sipconvertfrominstance">9.19 sipConvertFromInstance()</a></h2>
<dl class="docutils">
<dt>PyObject *sipConvertFromInstance(void *cpp, sipWrapperType *type, PyObject *transferObj)</dt>
-<dd>This converts a C structure or a C++ class instance to a Python class
+<dd><p class="first">This converts a C structure or a C++ class instance to a Python class
instance object. <em>cpp</em> is the C/C++ instance. If the instance has already
been wrapped then the result is a new reference to the existing instance
object. <em>type</em> is the generated type corresponding to the C/C++ type.
@@ -4282,48 +4469,73 @@ with C/C++. If it is <tt class="docutils literal"><span class="pre">Py_None</sp
via a call to <a class="reference" href="#siptransferback">sipTransferBack()</a>. Otherwise ownership is transferred to
C/C++ and the instance associated with <em>transferObj</em> via a call to
<a class="reference" href="#siptransferto">sipTransferTo()</a>. The Python class is influenced by any applicable
-<a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code.</dd>
+<a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code.</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use
+<a class="reference" href="#sipconvertfromtype">sipConvertFromType()</a>.</p>
+</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id184" id="sipconvertfrommappedtype" name="sipconvertfrommappedtype">9.19 sipConvertFromMappedType()</a></h2>
+<h2><a class="toc-backref" href="#id192" id="sipconvertfrommappedtype" name="sipconvertfrommappedtype">9.20 sipConvertFromMappedType()</a></h2>
<dl class="docutils">
<dt>PyObject *sipConvertFromMappedType(void *cpp, const sipMappedType *mt, PyObject *transferObj)</dt>
-<dd>This converts a C structure or a C++ class instance wrapped as a mapped
+<dd><p class="first">This converts a C structure or a C++ class instance wrapped as a mapped
type to a Python object. <em>cpp</em> is the C/C++ instance. <em>mt</em> is the opaque
structure returned by <a class="reference" href="#sipfindmappedtype">sipFindMappedType()</a>. <em>transferObj</em> controls any
ownership changes to <em>obj</em>. If it is <tt class="docutils literal"><span class="pre">NULL</span></tt> then the ownership is
unchanged. If it is <tt class="docutils literal"><span class="pre">Py_None</span></tt> then ownership is transferred to Python
via a call to <a class="reference" href="#siptransferback">sipTransferBack()</a>. Otherwise ownership is transferred to
C/C++ and the instance associated with the <tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> argument via a
-call to <a class="reference" href="#siptransferto">sipTransferTo()</a>.</dd>
+call to <a class="reference" href="#siptransferto">sipTransferTo()</a>.</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use
+<a class="reference" href="#sipconvertfromtype">sipConvertFromType()</a>.</p>
+</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id185" id="sipconvertfromnamedenum" name="sipconvertfromnamedenum">9.20 sipConvertFromNamedEnum()</a></h2>
+<h2><a class="toc-backref" href="#id193" id="sipconvertfromnamedenum" name="sipconvertfromnamedenum">9.21 sipConvertFromNamedEnum()</a></h2>
<dl class="docutils">
<dt>PyObject *sipConvertFromNamedEnum(int eval, PyTypeObject *type)</dt>
-<dd>This converts a named C/C++ <tt class="docutils literal"><span class="pre">enum</span></tt> to an instance of the corresponding
+<dd><p class="first">This converts a named C/C++ <tt class="docutils literal"><span class="pre">enum</span></tt> to an instance of the corresponding
Python named enum type. <em>eval</em> is the enumerated value to convert. <em>type</em>
is the generated Python type object (see <a class="reference" href="#generated-named-enum-type-objects">Generated Named Enum Type
-Objects</a>).</dd>
+Objects</a>).</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use
+<a class="reference" href="#sipconvertfromenum">sipConvertFromEnum()</a>.</p>
+</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id186" id="sipconvertfromnewinstance" name="sipconvertfromnewinstance">9.21 sipConvertFromNewInstance()</a></h2>
+<h2><a class="toc-backref" href="#id194" id="sipconvertfromnewinstance" name="sipconvertfromnewinstance">9.22 sipConvertFromNewInstance()</a></h2>
<dl class="docutils">
<dt>PyObject *sipConvertFromNewInstance(void *cpp, sipWrapperType *type, PyObject *transferObj)</dt>
-<dd>This converts a new C structure or a new C++ class instance to a Python
+<dd><p class="first">This converts a new C structure or a new C++ class instance to a Python
class instance object. <em>cpp</em> is the C/C++ instance. <em>type</em> is the
generated type corresponding to the C/C++ type. <em>transferObj</em> controls the
ownership of the returned value. If it is <tt class="docutils literal"><span class="pre">NULL</span></tt> or <tt class="docutils literal"><span class="pre">Py_None</span></tt> then
ownership will be with Python. Otherwise ownership will be with C/C++ and
the instance associated with <em>transferObj</em>. The Python class is influenced
+by any applicable <a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code.</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use
+<a class="reference" href="#sipconvertfromnewtype">sipConvertFromNewType()</a>.</p>
+</dd>
+</dl>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id195" id="sipconvertfromnewtype" name="sipconvertfromnewtype">9.23 sipConvertFromNewType()</a></h2>
+<dl class="docutils">
+<dt>PyObject *sipConvertFromNewType(void *cpp, const sipTypeDef *td, PyObject *transferObj)</dt>
+<dd>This converts a new C structure, C++ class or mapped type instance to a
+Python object. <em>cpp</em> is the C/C++ instance. <em>td</em> is the generated type
+structure corresponding to the C/C++ type. <em>transferObj</em> controls the
+ownership of the returned value. If it is <tt class="docutils literal"><span class="pre">NULL</span></tt> or <tt class="docutils literal"><span class="pre">Py_None</span></tt> then
+ownership will be with Python. Otherwise ownership will be with C/C++ and
+the instance associated with <em>transferObj</em>. The Python class is influenced
by any applicable <a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id187" id="sipconvertfromsequenceindex" name="sipconvertfromsequenceindex">9.22 sipConvertFromSequenceIndex()</a></h2>
+<h2><a class="toc-backref" href="#id196" id="sipconvertfromsequenceindex" name="sipconvertfromsequenceindex">9.24 sipConvertFromSequenceIndex()</a></h2>
<dl class="docutils">
<dt>SIP_SSIZE_T sipConvertFromSequenceIndex(SIP_SSIZE_T idx, SIP_SSIZE_T len)</dt>
<dd>This converts a Python sequence index (i.e. where a negative value refers
@@ -4334,7 +4546,7 @@ arguments have type <tt class="docutils literal"><span class="pre">int</span></t
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id188" id="sipconvertfromsliceobject" name="sipconvertfromsliceobject">9.23 sipConvertFromSliceObject()</a></h2>
+<h2><a class="toc-backref" href="#id197" id="sipconvertfromsliceobject" name="sipconvertfromsliceobject">9.25 sipConvertFromSliceObject()</a></h2>
<dl class="docutils">
<dt>int sipConvertFromSliceObject(PyObject *slice, SIP_SSIZE_T length, SIP_SSIZE_T *start, SIP_SSIZE_T *stop, SIP_SSIZE_T *step, SIP_SSIZE_T *slicelength)</dt>
<dd>This is a thin wrapper around the Python <tt class="docutils literal"><span class="pre">PySlice_GetIndicesEx()</span></tt>
@@ -4343,7 +4555,27 @@ compatible with SIP v3.x and versions of Python earlier that v2.3.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id189" id="sipconvertfromvoidptr" name="sipconvertfromvoidptr">9.24 sipConvertFromVoidPtr()</a></h2>
+<h2><a class="toc-backref" href="#id198" id="sipconvertfromtype" name="sipconvertfromtype">9.26 sipConvertFromType()</a></h2>
+<dl class="docutils">
+<dt>PyObject *sipConvertFromType(void *cpp, const sipTypeDef *td, PyObject *transferObj)</dt>
+<dd>This converts a C structure, a C++ class instance or a mapped type to a
+Python object. <em>cpp</em> is the C/C++ instance. If the instance has already
+been wrapped then the result is a new reference to the existing object.
+<em>td</em> is the generated type structure corresponding to the C/C++ type.
+<em>transferObj</em> controls the ownership of the returned value. If the
+structure or class instance has already been wrapped then the result is a
+new reference to the existing object. If it is <tt class="docutils literal"><span class="pre">NULL</span></tt> and the instance
+has already been wrapped then the ownership is unchanged. If it is
+<tt class="docutils literal"><span class="pre">NULL</span></tt> and the instance is newly wrapped then ownership will be with
+C/C++. If it is <tt class="docutils literal"><span class="pre">Py_None</span></tt> then ownership is transferred to Python via a
+call to <a class="reference" href="#siptransferback">sipTransferBack()</a>. Otherwise ownership is transferred to C/C++
+and the instance associated with <em>transferObj</em> via a call to
+<a class="reference" href="#siptransferto">sipTransferTo()</a>. The Python class is influenced by any applicable
+<a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code.</dd>
+</dl>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id199" id="sipconvertfromvoidptr" name="sipconvertfromvoidptr">9.27 sipConvertFromVoidPtr()</a></h2>
<dl class="docutils">
<dt>PyObject *sipConvertFromVoidPtr(void *cpp)</dt>
<dd>This creates a <tt class="docutils literal"><span class="pre">sip.voidptr</span></tt> object for a memory address. The object
@@ -4351,7 +4583,7 @@ will be writeable but has no associated size. <em>cpp</em> is the memory addres
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id190" id="sipconvertfromvoidptrandsize" name="sipconvertfromvoidptrandsize">9.25 sipConvertFromVoidPtrAndSize()</a></h2>
+<h2><a class="toc-backref" href="#id200" id="sipconvertfromvoidptrandsize" name="sipconvertfromvoidptrandsize">9.28 sipConvertFromVoidPtrAndSize()</a></h2>
<dl class="docutils">
<dt>PyObject *sipConvertFromVoidPtrAndSize(void *cpp, SIP_SSIZE_T size)</dt>
<dd>This creates a <tt class="docutils literal"><span class="pre">sip.voidptr</span></tt> object for a memory address. The object
@@ -4361,18 +4593,7 @@ object.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id191" id="sipconverttocpp" name="sipconverttocpp">9.26 sipConvertToCpp()</a></h2>
-<dl class="docutils">
-<dt>void *sipConvertToCpp(PyObject *obj, sipWrapperType *type, int *iserr)</dt>
-<dd><p class="first">This function is deprecated from SIP v4.4. It is equivalent to:</p>
-<pre class="last literal-block">
-sipConvertToInstance(obj, type, NULL, SIP_NO_CONVERTORS, NULL, iserr);
-</pre>
-</dd>
-</dl>
-</div>
-<div class="section">
-<h2><a class="toc-backref" href="#id192" id="sipconverttoinstance" name="sipconverttoinstance">9.27 sipConvertToInstance()</a></h2>
+<h2><a class="toc-backref" href="#id201" id="sipconverttoinstance" name="sipconverttoinstance">9.29 sipConvertToInstance()</a></h2>
<dl class="docutils">
<dt>void *sipConvertToInstance(PyObject *obj, sipWrapperType *type, PyObject *transferObj, int flags, int *state, int *iserr)</dt>
<dd><p class="first">This converts a Python object to an instance of a C structure or C++ class
@@ -4393,7 +4614,7 @@ check.</p>
<a class="reference" href="#converttotypecode">%ConvertToTypeCode</a> for <em>type</em>.</li>
</ul>
</blockquote>
-<p class="last">If <em>state</em> is not <tt class="docutils literal"><span class="pre">NULL</span></tt> then the location it points to is set to
+<p>If <em>state</em> is not <tt class="docutils literal"><span class="pre">NULL</span></tt> then the location it points to is set to
describe the state of the returned C/C++ instance and is the value returned
by any <a class="reference" href="#converttotypecode">%ConvertToTypeCode</a>. The calling code must then release the value
at some point to prevent a memory leak by calling <a class="reference" href="#sipreleaseinstance">sipReleaseInstance()</a>.
@@ -4402,11 +4623,13 @@ non-zero value. If it was initially a non-zero value then the conversion
isn't attempted in the first place. (This allows several calls to be made
that share the same error flag so that it only needs to be tested once
rather than after each call.)</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use
+<a class="reference" href="#sipconverttotype">sipConvertToType()</a></p>
</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id193" id="sipconverttomappedtype" name="sipconverttomappedtype">9.28 sipConvertToMappedType()</a></h2>
+<h2><a class="toc-backref" href="#id202" id="sipconverttomappedtype" name="sipconverttomappedtype">9.30 sipConvertToMappedType()</a></h2>
<dl class="docutils">
<dt>void *sipConvertToMappedType(PyObject *obj, const sipMappedType *mt, PyObject *transferObj, int flags, int *state, int *iserr)</dt>
<dd><p class="first">This converts a Python object to an instance of a C structure or C++
@@ -4424,7 +4647,7 @@ following values used to fine tune the check.</p>
<li><tt class="docutils literal"><span class="pre">SIP_NOT_NONE</span></tt> causes the check to fail if <em>obj</em> is <tt class="docutils literal"><span class="pre">None</span></tt>.</li>
</ul>
</blockquote>
-<p class="last">If <em>state</em> is not <tt class="docutils literal"><span class="pre">NULL</span></tt> then the location it points to is set to
+<p>If <em>state</em> is not <tt class="docutils literal"><span class="pre">NULL</span></tt> then the location it points to is set to
describe the state of the returned C/C++ instance and is the value returned
by any <a class="reference" href="#converttotypecode">%ConvertToTypeCode</a>. The calling code must then release the value
at some point to prevent a memory leak by calling
@@ -4433,11 +4656,47 @@ points to is set to a non-zero value. If it was initially a non-zero value
then the conversion isn't attempted in the first place. (This allows
several calls to be made that share the same error flag so that it only
needs to be tested once rather than after each call.)</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use
+<a class="reference" href="#sipconverttotype">sipConvertToType()</a></p>
+</dd>
+</dl>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id203" id="sipconverttotype" name="sipconverttotype">9.31 sipConvertToType()</a></h2>
+<dl class="docutils">
+<dt>void *sipConvertToType(PyObject *obj, const sipTypeDef *td, PyObject *transferObj, int flags, int *state, int *iserr)</dt>
+<dd><p class="first">This converts a Python object to an instance of a C structure, C++ class or
+mapped type assuming that a previous call to <a class="reference" href="#sipcanconverttotype">sipCanConvertToType()</a> has
+been successful. <em>obj</em> is the Python object. <em>td</em> is the generated type
+structure corresponding to the C/C++ type returned. It may be any class in
+the object's class hierarchy. <em>transferObj</em> controls any ownership changes
+to <em>obj</em>. If it is <tt class="docutils literal"><span class="pre">NULL</span></tt> then the ownership is unchanged. If it is
+<tt class="docutils literal"><span class="pre">Py_None</span></tt> then ownership is transferred to Python via a call to
+<a class="reference" href="#siptransferback">sipTransferBack()</a>. Otherwise ownership is transferred to C/C++ and
+<em>obj</em> associated with <em>transferObj</em> via a call to <a class="reference" href="#siptransferto">sipTransferTo()</a>.
+<em>flags</em> is any combination of the following values used to fine tune the
+check.</p>
+<blockquote>
+<ul class="simple">
+<li><tt class="docutils literal"><span class="pre">SIP_NOT_NONE</span></tt> causes the check to fail if <em>obj</em> is <tt class="docutils literal"><span class="pre">None</span></tt>.</li>
+<li><tt class="docutils literal"><span class="pre">SIP_NO_CONVERTORS</span></tt> suppresses the use of of any
+<a class="reference" href="#converttotypecode">%ConvertToTypeCode</a> for <em>td</em>. It is ignored for mapped types.</li>
+</ul>
+</blockquote>
+<p class="last">If <em>state</em> is not <tt class="docutils literal"><span class="pre">NULL</span></tt> then the location it points to is set to
+describe the state of the returned C/C++ instance and is the value returned
+by any <a class="reference" href="#converttotypecode">%ConvertToTypeCode</a>. The calling code must then release the value
+at some point to prevent a memory leak by calling <a class="reference" href="#sipreleasetype">sipReleaseType()</a>. If
+there is an error then the location <em>iserr</em> points to is set to a non-zero
+value. If it was initially a non-zero value then the conversion isn't
+attempted in the first place. (This allows several calls to be made that
+share the same error flag so that it only needs to be tested once rather
+than after each call.)</p>
</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id194" id="sipconverttovoidptr" name="sipconverttovoidptr">9.29 sipConvertToVoidPtr()</a></h2>
+<h2><a class="toc-backref" href="#id204" id="sipconverttovoidptr" name="sipconverttovoidptr">9.32 sipConvertToVoidPtr()</a></h2>
<dl class="docutils">
<dt>void *sipConvertToVoidPtr(PyObject *obj)</dt>
<dd>This converts a Python object to a memory address. <tt class="docutils literal"><span class="pre">obj</span></tt> may be
@@ -4447,34 +4706,7 @@ was successful.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id195" id="sipdisconnectrx" name="sipdisconnectrx">9.30 sipDisconnectRx()</a></h2>
-<dl class="docutils">
-<dt>PyObject *sipDisconnectRx(PyObject *sender, const char *signal, PyObject *receiver, const char *slot)</dt>
-<dd>This disconnects a signal from a signal or slot and returns <tt class="docutils literal"><span class="pre">Py_True</span></tt> if
-the signal was disconnected or <tt class="docutils literal"><span class="pre">Py_False</span></tt> if not. If there was some
-other error then a Python exception is raised and <tt class="docutils literal"><span class="pre">NULL</span></tt> is returned.
-<em>sender</em> is the wrapped <tt class="docutils literal"><span class="pre">QObject</span></tt> derived instance that emits the signal.
-<em>signal</em> is the typed name of the signal. <em>receiver</em> is the wrapped
-<tt class="docutils literal"><span class="pre">QObject</span></tt> derived instance or Python callable that the signal is
-connected to. <em>slot</em> is the typed name of the slot, or <tt class="docutils literal"><span class="pre">NULL</span></tt> if
-<em>receiver</em> is a Python callable. It is normally only used by PyQt to
-implement <tt class="docutils literal"><span class="pre">QObject.disconnect()</span></tt>.</dd>
-</dl>
-</div>
-<div class="section">
-<h2><a class="toc-backref" href="#id196" id="sipemitsignal" name="sipemitsignal">9.31 sipEmitSignal()</a></h2>
-<dl class="docutils">
-<dt>int sipEmitSignal(PyObject *txobj, const char *signal, PyObject *args)</dt>
-<dd>This emits a signal and returns zero if there was no error. If there was
-an error then a Python exception is raised and a negative value is
-returned. <em>txobj</em> is the wrapped <tt class="docutils literal"><span class="pre">QObject</span></tt> derived instance that emits
-the signal. <em>signal</em> is the typed name of the signal. <em>args</em> is a Python
-tuple of the signal arguments. It is normally only used by PyQt to
-implement <tt class="docutils literal"><span class="pre">QObject.emit()</span></tt>.</dd>
-</dl>
-</div>
-<div class="section">
-<h2><a class="toc-backref" href="#id197" id="sipexportsymbol" name="sipexportsymbol">9.32 sipExportSymbol()</a></h2>
+<h2><a class="toc-backref" href="#id205" id="sipexportsymbol" name="sipexportsymbol">9.33 sipExportSymbol()</a></h2>
<dl class="docutils">
<dt>int sipExportSymbol(const char *name, void *sym)</dt>
<dd>Python does not allow extension modules to directly access symbols in
@@ -4486,58 +4718,90 @@ already associated with a symbol or there was some other error.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id198" id="sipfindclass" name="sipfindclass">9.33 sipFindClass()</a></h2>
+<h2><a class="toc-backref" href="#id206" id="sipfindclass" name="sipfindclass">9.34 sipFindClass()</a></h2>
<dl class="docutils">
<dt>sipWrapperType *sipFindClass(const char *type)</dt>
-<dd>This returns a pointer to the generated type corresponding to a C/C++ type.
+<dd><p class="first">This returns a pointer to the generated type corresponding to a C/C++ type.
<em>type</em> is the C/C++ declaration of the type. <tt class="docutils literal"><span class="pre">NULL</span></tt> is returned if the
C/C++ type doesn't exist. The value of the pointer will not change and
-may be saved in a static cache.</dd>
+may be saved in a static cache.</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use <a class="reference" href="#sipfindtype">sipFindType()</a>.</p>
+</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id199" id="sipfindmappedtype" name="sipfindmappedtype">9.34 sipFindMappedType()</a></h2>
+<h2><a class="toc-backref" href="#id207" id="sipfindmappedtype" name="sipfindmappedtype">9.35 sipFindMappedType()</a></h2>
<dl class="docutils">
<dt>const sipMappedType *sipFindMappedType(const char *type)</dt>
-<dd>This returns a pointer to an opaque structure describing a mapped type.
+<dd><p class="first">This returns a pointer to an opaque structure describing a mapped type.
<em>type</em> is the C/C++ declaration of the type. <tt class="docutils literal"><span class="pre">NULL</span></tt> is returned if the
mapped type doesn't exist. The value of the pointer will not change and
-may be saved in a static cache.</dd>
+may be saved in a static cache.</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use <a class="reference" href="#sipfindtype">sipFindType()</a>.</p>
+</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id200" id="sipfindnamedenum" name="sipfindnamedenum">9.35 sipFindNamedEnum()</a></h2>
+<h2><a class="toc-backref" href="#id208" id="sipfindnamedenum" name="sipfindnamedenum">9.36 sipFindNamedEnum()</a></h2>
<dl class="docutils">
<dt>PyTypeObject *sipFindNamedEnum(const char *type)</dt>
-<dd>This returns a pointer to the generated type corresponding to a named C/C++
+<dd><p class="first">This returns a pointer to the generated type corresponding to a named C/C++
enum. <em>type</em> is the C/C++ declaration of the enum. <tt class="docutils literal"><span class="pre">NULL</span></tt> is returned
if the named C/C++ enum doesn't exist. The value of the pointer will not
+change and may be saved in a static cache.</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use <a class="reference" href="#sipfindtype">sipFindType()</a>.</p>
+</dd>
+</dl>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id209" id="sipfindtype" name="sipfindtype">9.37 sipFindType()</a></h2>
+<dl class="docutils">
+<dt>const sipTypeDef *sipFindType(const char *type)</dt>
+<dd>This returns a pointer to the SIP generated type structure corresponding to
+a C/C++ type. <em>type</em> is the C/C++ declaration of the type. NULL is
+returned if the type doesn't exist. The value of the pointer will not
change and may be saved in a static cache.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id201" id="sipforceconverttoinstance" name="sipforceconverttoinstance">9.36 sipForceConvertToInstance()</a></h2>
+<h2><a class="toc-backref" href="#id210" id="sipforceconverttoinstance" name="sipforceconverttoinstance">9.38 sipForceConvertToInstance()</a></h2>
<dl class="docutils">
<dt>void *sipForceConvertToInstance(PyObject *obj, sipWrapperType *type, PyObject *transferObj, int flags, int *state, int *iserr)</dt>
-<dd>This converts a Python object to an instance of a C structure or C++ class
+<dd><p class="first">This converts a Python object to an instance of a C structure or C++ class
by calling <a class="reference" href="#sipcanconverttoinstance">sipCanConvertToInstance()</a> and, if it is successfull, calling
<a class="reference" href="#sipconverttoinstance">sipConvertToInstance()</a>. See <a class="reference" href="#sipconverttoinstance">sipConvertToInstance()</a> for a full
-description of the arguments.</dd>
+description of the arguments.</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use
+<a class="reference" href="#sipforceconverttotype">sipForceConvertToType()</a>.</p>
+</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id202" id="sipforceconverttomappedtype" name="sipforceconverttomappedtype">9.37 sipForceConvertToMappedType()</a></h2>
+<h2><a class="toc-backref" href="#id211" id="sipforceconverttomappedtype" name="sipforceconverttomappedtype">9.39 sipForceConvertToMappedType()</a></h2>
<dl class="docutils">
<dt>void *sipForceConvertToMappedType(PyObject *obj, const sipMappedType *mt, PyObject *transferObj, int flags, int *state, int *iserr)</dt>
-<dd>This converts a Python object to an instance of a C structure or C++ class
+<dd><p class="first">This converts a Python object to an instance of a C structure or C++ class
which has been implemented as a mapped type by calling
<a class="reference" href="#sipcanconverttomappedtype">sipCanConvertToMappedType()</a> and, if it is successfull, calling
<a class="reference" href="#sipconverttomappedtype">sipConvertToMappedType()</a>. See <a class="reference" href="#sipconverttomappedtype">sipConvertToMappedType()</a> for a full
+description of the arguments.</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use
+<a class="reference" href="#sipforceconverttotype">sipForceConvertToType()</a>.</p>
+</dd>
+</dl>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id212" id="sipforceconverttotype" name="sipforceconverttotype">9.40 sipForceConvertToType()</a></h2>
+<dl class="docutils">
+<dt>void *sipForceConvertToType(PyObject *obj, const sipTypeDef *td, PyObject *transferObj, int flags, int *state, int *iserr)</dt>
+<dd>This converts a Python object to an instance of a C structure, C++ class or
+mapped type by calling <a class="reference" href="#sipcanconverttotype">sipCanConvertToType()</a> and, if it is successfull,
+calling <a class="reference" href="#sipconverttotype">sipConvertToType()</a>. See <a class="reference" href="#sipconverttotype">sipConvertToType()</a> for a full
description of the arguments.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id203" id="sipfree" name="sipfree">9.38 sipFree()</a></h2>
+<h2><a class="toc-backref" href="#id213" id="sipfree" name="sipfree">9.41 sipFree()</a></h2>
<dl class="docutils">
<dt>void sipFree(void *mem)</dt>
<dd>This returns an area of memory allocated by <a class="reference" href="#sipmalloc">sipMalloc()</a> to the heap.
@@ -4545,27 +4809,32 @@ description of the arguments.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id204" id="sipgetsender" name="sipgetsender">9.39 sipGetSender()</a></h2>
+<h2><a class="toc-backref" href="#id214" id="sipgetpyobject" name="sipgetpyobject">9.42 sipGetPyObject()</a></h2>
<dl class="docutils">
-<dt>const void *sipGetSender()</dt>
-<dd>This returns a pointer to the last <tt class="docutils literal"><span class="pre">QObject</span></tt> instance that emitted a Qt
-signal. It is normally only used by PyQt to implement
-<tt class="docutils literal"><span class="pre">QObject.sender()</span></tt>.</dd>
+<dt>PyObject *sipGetPyObject(void *cppptr, const sipTypeDef *td)</dt>
+<dd>This returns a borrowed reference to the Python object for a C structure or
+C++ class instance. If the structure or class instance hasn't been wrapped
+then <tt class="docutils literal"><span class="pre">NULL</span></tt> is returned (and no Python exception is raised). <em>cppptr</em> is
+the pointer to the structure or class instance. <em>td</em> is the generated type
+structure corresponding to the C/C++ type.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id205" id="sipgetwrapper" name="sipgetwrapper">9.40 sipGetWrapper()</a></h2>
+<h2><a class="toc-backref" href="#id215" id="sipgetwrapper" name="sipgetwrapper">9.43 sipGetWrapper()</a></h2>
<dl class="docutils">
<dt>PyObject *sipGetWrapper(void *cppptr, sipWrapperType *type)</dt>
-<dd>This returns a borrowed reference to the wrapped instance object for a C
+<dd><p class="first">This returns a borrowed reference to the wrapped instance object for a C
structure or C++ class instance. If the structure or class instance
hasn't been wrapped then <tt class="docutils literal"><span class="pre">NULL</span></tt> is returned (and no Python exception is
raised). <em>cppptr</em> is the pointer to the structure or class instance.
-<em>type</em> is the generated type corresponding to the C/C++ type.</dd>
+<em>type</em> is the generated type corresponding to the C/C++ type.</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use
+<a class="reference" href="#sipgetpyobject">sipGetPyObject()</a>.</p>
+</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id206" id="sipimportsymbol" name="sipimportsymbol">9.41 sipImportSymbol()</a></h2>
+<h2><a class="toc-backref" href="#id216" id="sipimportsymbol" name="sipimportsymbol">9.44 sipImportSymbol()</a></h2>
<dl class="docutils">
<dt>void *sipImportSymbol(const char *name)</dt>
<dd>Python does not allow extension modules to directly access symbols in
@@ -4577,7 +4846,7 @@ symbol.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id207" id="sipinttypeclassmap" name="sipinttypeclassmap">9.42 sipIntTypeClassMap</a></h2>
+<h2><a class="toc-backref" href="#id217" id="sipinttypeclassmap" name="sipinttypeclassmap">9.45 sipIntTypeClassMap</a></h2>
<p>This C structure is used with <a class="reference" href="#sipmapinttoclass">sipMapIntToClass()</a> to define a mapping
between integer based RTTI and <a class="reference" href="#generated-type-objects">generated type objects</a>. The structure
elements are as follows.</p>
@@ -4587,20 +4856,10 @@ elements are as follows.</p>
<dt>sipWrapperType **pyType.</dt>
<dd>A pointer to the corresponding Python type object.</dd>
</dl>
+<p>This is deprecated from SIP v4.8.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id208" id="sipissubclassinstance" name="sipissubclassinstance">9.43 sipIsSubClassInstance()</a></h2>
-<dl class="docutils">
-<dt>int sipIsSubClassInstance(PyObject *obj, sipWrapperType *type)</dt>
-<dd><p class="first">This function is deprecated from SIP v4.4. It is equivalent to:</p>
-<pre class="last literal-block">
-sipCanConvertToInstance(obj, type, SIP_NOT_NONE | SIP_NO_CONVERTORS);
-</pre>
-</dd>
-</dl>
-</div>
-<div class="section">
-<h2><a class="toc-backref" href="#id209" id="siplong-asunsignedlong" name="siplong-asunsignedlong">9.44 sipLong_AsUnsignedLong()</a></h2>
+<h2><a class="toc-backref" href="#id218" id="siplong-asunsignedlong" name="siplong-asunsignedlong">9.46 sipLong_AsUnsignedLong()</a></h2>
<dl class="docutils">
<dt>unsigned long sipLong_AsUnsignedLong(PyObject *obj)</dt>
<dd>This function is a thin wrapper around PyLong_AsUnsignedLong() that works
@@ -4608,7 +4867,7 @@ around a bug in Python v2.3.x and earlier when converting integer objects.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id210" id="sipmalloc" name="sipmalloc">9.45 sipMalloc()</a></h2>
+<h2><a class="toc-backref" href="#id219" id="sipmalloc" name="sipmalloc">9.47 sipMalloc()</a></h2>
<dl class="docutils">
<dt>void *sipMalloc(size_t nbytes)</dt>
<dd>This allocates an area of memory of size <em>nytes</em> on the heap using the
@@ -4617,33 +4876,37 @@ returned and a Python exception raised. See <a class="reference" href="#sipfree
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id211" id="sipmapinttoclass" name="sipmapinttoclass">9.46 sipMapIntToClass()</a></h2>
+<h2><a class="toc-backref" href="#id220" id="sipmapinttoclass" name="sipmapinttoclass">9.48 sipMapIntToClass()</a></h2>
<dl class="docutils">
<dt>sipWrapperType *sipMapIntToClass(int type, const sipIntTypeClassMap *map, int maplen)</dt>
-<dd>This is used in <a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code as a convenient way of
+<dd><p class="first">This is used in <a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code as a convenient way of
converting integer based RTTI to the corresponding Python type object.
<em>type</em> is the RTTI. <em>map</em> is the table of known RTTI and the corresponding
type objects (see <a class="reference" href="#sipinttypeclassmap">sipIntTypeClassMap</a>). The entries in the table must be
sorted in ascending order of RTTI. <em>maplen</em> is the number of entries in
the table. The corresponding Python type object is returned, or <tt class="docutils literal"><span class="pre">NULL</span></tt>
-if <em>type</em> wasn't in <em>map</em>.</dd>
+if <em>type</em> wasn't in <em>map</em>.</p>
+<p class="last">This is deprecated from SIP v4.8.</p>
+</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id212" id="sipmapstringtoclass" name="sipmapstringtoclass">9.47 sipMapStringToClass()</a></h2>
+<h2><a class="toc-backref" href="#id221" id="sipmapstringtoclass" name="sipmapstringtoclass">9.49 sipMapStringToClass()</a></h2>
<dl class="docutils">
<dt>sipWrapperType *sipMapStringToClass(char *type, const sipStringTypeClassMap *map, int maplen)</dt>
-<dd>This is used in <a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code as a convenient way of
+<dd><p class="first">This is used in <a class="reference" href="#converttosubclasscode">%ConvertToSubClassCode</a> code as a convenient way of
converting <tt class="docutils literal"><span class="pre">'\0'</span></tt> terminated string based RTTI to the corresponding
Python type object. <em>type</em> is the RTTI. <em>map</em> is the table of known RTTI
and the corresponding type objects (see <a class="reference" href="#sipstringtypeclassmap">sipStringTypeClassMap</a>). The
entries in the table must be sorted in ascending order of RTTI. <em>maplen</em>
is the number of entries in the table. The corresponding Python type
-object is returned, or <tt class="docutils literal"><span class="pre">NULL</span></tt> if <em>type</em> wasn't in <em>map</em>.</dd>
+object is returned, or <tt class="docutils literal"><span class="pre">NULL</span></tt> if <em>type</em> wasn't in <em>map</em>.</p>
+<p class="last">This is deprecated from SIP v4.8.</p>
+</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id213" id="sipparseresult" name="sipparseresult">9.48 sipParseResult()</a></h2>
+<h2><a class="toc-backref" href="#id222" id="sipparseresult" name="sipparseresult">9.50 sipParseResult()</a></h2>
<dl class="docutils">
<dt>int sipParseResult(int *iserr, PyObject *method, PyObject *result, const char *format, ...)</dt>
<dd><p class="first">This converts a Python object (usually returned by a method) to C/C++ based
@@ -4664,10 +4927,6 @@ entry in parentheses is the Python object type that the format character
will convert, and the entry in brackets are the types of the C/C++ values
to be passed.</p>
<dl class="last docutils">
-<dt><tt class="docutils literal"><span class="pre">a</span></tt> (string) [const char **, int *]</dt>
-<dd>Convert a Python string to a C/C++ character array and its length. If
-the Python object is <tt class="docutils literal"><span class="pre">Py_None</span></tt> then the array and length are <tt class="docutils literal"><span class="pre">NULL</span></tt>
-and zero respectively. This is deprecated, use <tt class="docutils literal"><span class="pre">g</span></tt> instead.</dd>
<dt><tt class="docutils literal"><span class="pre">b</span></tt> (integer) [bool *]</dt>
<dd>Convert a Python integer to a C/C++ <tt class="docutils literal"><span class="pre">bool</span></tt>.</dd>
<dt><tt class="docutils literal"><span class="pre">c</span></tt> (string) [char *]</dt>
@@ -4707,17 +4966,12 @@ Python object is <tt class="docutils literal"><span class="pre">Py_None</span></
<dd>Convert a Python unicode object to a C/C++ <tt class="docutils literal"><span class="pre">L'\0'</span></tt> terminated wide
character string. If the Python object is <tt class="docutils literal"><span class="pre">Py_None</span></tt> then the string
is <tt class="docutils literal"><span class="pre">NULL</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">A</span></tt> (unicode) [wchar_t **, int *]</dt>
-<dd>Convert a Python unicode object to a C/C++ wide character array and its
-length. If the Python object is <tt class="docutils literal"><span class="pre">Py_None</span></tt> then the array and length
-are <tt class="docutils literal"><span class="pre">NULL</span></tt> and zero respectively. This is deprecated, use <tt class="docutils literal"><span class="pre">G</span></tt>
-instead.</dd>
<dt><tt class="docutils literal"><span class="pre">Cf</span></tt> (wrapped class) [sipWrapperType *, int *, void **]</dt>
<dd><p class="first">Convert a Python object to a C structure or a C++ class instance and
return its state as described in <a class="reference" href="#sipconverttoinstance">sipConvertToInstance()</a>. <tt class="docutils literal"><span class="pre">f</span></tt> is a
combination of the following flags encoded as an ASCII character by
adding <tt class="docutils literal"><span class="pre">0</span></tt> to the combined value:</p>
-<blockquote class="last">
+<blockquote>
<p>0x01 disallows the conversion of <tt class="docutils literal"><span class="pre">Py_None</span></tt> to <tt class="docutils literal"><span class="pre">NULL</span></tt></p>
<p>0x02 implements the <a class="reference" href="#factory">Factory</a> annotation</p>
<dl class="docutils">
@@ -4726,13 +4980,13 @@ adding <tt class="docutils literal"><span class="pre">0</span></tt> to the combi
not passed if this flag is specified.</dd>
</dl>
</blockquote>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use <tt class="docutils literal"><span class="pre">Df</span></tt>.</p>
</dd>
-<dt><tt class="docutils literal"><span class="pre">Df</span></tt> (mapped type) [const sipMappedType *, int *, void **]</dt>
-<dd><p class="first">Convert a Python object to a C structure or a C++ class instance
-implemented as a mapped type and return its state as described in
-<a class="reference" href="#sipconverttomappedtype">sipConvertToMappedType()</a>. <tt class="docutils literal"><span class="pre">f</span></tt> is a combination of the following
-flags encoded as an ASCII character by adding <tt class="docutils literal"><span class="pre">0</span></tt> to the combined
-value:</p>
+<dt><tt class="docutils literal"><span class="pre">Df</span></tt> (wrapped instance) [const sipTypeDef *, int *, void **]</dt>
+<dd><p class="first">Convert a Python object to a C structure, C++ class or mapped type
+instance and return its state as described in <a class="reference" href="#sipconverttotype">sipConvertToType()</a>.
+<tt class="docutils literal"><span class="pre">f</span></tt> is a combination of the following flags encoded as an ASCII
+character by adding <tt class="docutils literal"><span class="pre">0</span></tt> to the combined value:</p>
<blockquote class="last">
<p>0x01 disallows the conversion of <tt class="docutils literal"><span class="pre">Py_None</span></tt> to <tt class="docutils literal"><span class="pre">NULL</span></tt></p>
<p>0x02 implements the <a class="reference" href="#factory">Factory</a> annotation</p>
@@ -4744,20 +4998,15 @@ not passed if this flag is specified.</dd>
</blockquote>
</dd>
<dt><tt class="docutils literal"><span class="pre">E</span></tt> (wrapped enum) [PyTypeObject *, enum *]</dt>
+<dd><p class="first">Convert a Python named enum type to the corresponding C/C++ <tt class="docutils literal"><span class="pre">enum</span></tt>.</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use <tt class="docutils literal"><span class="pre">F</span></tt>.</p>
+</dd>
+<dt><tt class="docutils literal"><span class="pre">F</span></tt> (wrapped enum) [sipTypeDef *, enum *]</dt>
<dd>Convert a Python named enum type to the corresponding C/C++ <tt class="docutils literal"><span class="pre">enum</span></tt>.</dd>
<dt><tt class="docutils literal"><span class="pre">G</span></tt> (unicode) [wchar_t **, SIP_SSIZE_T *]</dt>
<dd>Convert a Python unicode object to a C/C++ wide character array and its
length. If the Python object is <tt class="docutils literal"><span class="pre">Py_None</span></tt> then the array and length
are <tt class="docutils literal"><span class="pre">NULL</span></tt> and zero respectively.</dd>
-<dt><tt class="docutils literal"><span class="pre">L</span></tt> (object) [<em>type</em> *(*)(PyObject *obj, int *iserr), void **]</dt>
-<dd>Convert a Python object to a C structure or a C++ class instance using
-a convertor function. See <a class="reference" href="#generated-type-convertors">Generated Type Convertors</a>. This is
-deprecated from SIP v4.4.</dd>
-<dt><tt class="docutils literal"><span class="pre">M</span></tt> (object) [<em>type</em> *(*)(PyObject *obj, int *iserr), void **]</dt>
-<dd>Convert a Python object to a C structure or a C++ class instance using
-a convertor function. If the structure or class instance pointer is
-<tt class="docutils literal"><span class="pre">NULL</span></tt> then return an error. See <a class="reference" href="#generated-type-convertors">Generated Type Convertors</a>. This
-is deprecated from SIP v4.4.</dd>
<dt><tt class="docutils literal"><span class="pre">N</span></tt> (object) [PyTypeObject *, PyObject **]</dt>
<dd>A Python object is checked to see if it is a certain type and then
returned without any conversions. The reference count is incremented.
@@ -4778,29 +5027,104 @@ The Python object may not be <tt class="docutils literal"><span class="pre">Py_N
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id214" id="sipreleaseinstance" name="sipreleaseinstance">9.49 sipReleaseInstance()</a></h2>
+<h2><a class="toc-backref" href="#id223" id="sipregisterattributegetter" name="sipregisterattributegetter">9.51 sipRegisterAttributeGetter()</a></h2>
+<dl class="docutils">
+<dt>int sipRegisterAttributeGetter(const sipTypeDef *td, sipAttrGetterFunc getter)</dt>
+<dd><p class="first">This registers a handler that will called just before SIP needs to get an
+attribute from a wrapped type's dictionary for the first time. The handler
+must then populate the type's dictionary with any lazy attributes. -1 is
+returned if there was an error registering the handler, 0 is returned
+otherwise.</p>
+<p><em>td</em> is an optional generated type definition which means that the handler
+will only be called for types with that type or sub-classed from it. If it
+is <tt class="docutils literal"><span class="pre">NULL</span></tt> then the handler will be called for all types.</p>
+<p><em>getter</em> is the handler and it has the following signature.</p>
+<dl class="docutils">
+<dt>int handler(const sipTypeDef *td, PyObject *dict)</dt>
+<dd><p class="first"><em>td</em> is the generated type definition of the type whose dictionary is
+to be populated.</p>
+<p><em>dict</em> is the dictionary to be populated.</p>
+<p class="last">-1 is returned if there is an error, 0 is returned otherwise.</p>
+</dd>
+</dl>
+<p class="last">See the section <a class="reference" href="#lazy-type-attributes">Lazy Type Attributes</a> for more details.</p>
+</dd>
+</dl>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id224" id="sipregisterpytype" name="sipregisterpytype">9.52 sipRegisterPyType()</a></h2>
+<dl class="docutils">
+<dt>int sipRegisterPyType(PyTypeObject *type)</dt>
+<dd><p class="first">This registers a type object that can be used as the meta-type or
+super-type of a wrapped C++ type. <em>type</em> is the type. -1 is returned if
+there was an error registering the type, 0 is returned otherwise.</p>
+<p class="last">See the section <a class="reference" href="#types-and-meta-types">Types and Meta-types</a> for more details.</p>
+</dd>
+</dl>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id225" id="sipreleaseinstance" name="sipreleaseinstance">9.53 sipReleaseInstance()</a></h2>
<dl class="docutils">
<dt>void sipReleaseInstance(void *cpp, sipWrapperType *type, int state)</dt>
-<dd>This destroys a wrapped C/C++ instance if it was a temporary instance. It
+<dd><p class="first">This destroys a wrapped C/C++ instance if it was a temporary instance. It
is called after a call to either <a class="reference" href="#sipconverttoinstance">sipConvertToInstance()</a> or
<a class="reference" href="#sipforceconverttoinstance">sipForceConvertToInstance()</a>. <em>cpp</em> is the wrapped C/C++ instance.
<em>type</em> is the generated type corresponding to <em>cpp</em>. <em>state</em> describes the
-state of the instance.</dd>
+state of the instance.</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use
+<a class="reference" href="#sipreleasetype">sipReleaseType()</a>.</p>
+</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id215" id="sipreleasemappedtype" name="sipreleasemappedtype">9.50 sipReleaseMappedType()</a></h2>
+<h2><a class="toc-backref" href="#id226" id="sipreleasemappedtype" name="sipreleasemappedtype">9.54 sipReleaseMappedType()</a></h2>
<dl class="docutils">
<dt>void sipReleaseMappedType(void *cpp, const sipMappedType *mt, int state)</dt>
-<dd>This destroys a wrapped C/C++ mapped type if it was a temporary instance.
+<dd><p class="first">This destroys a wrapped C/C++ mapped type if it was a temporary instance.
It is called after a call to either <a class="reference" href="#sipconverttomappedtype">sipConvertToMappedType()</a> or
<a class="reference" href="#sipforceconverttomappedtype">sipForceConvertToMappedType()</a>. <em>cpp</em> is the wrapped C/C++ instance.
<em>mt</em> is the opaque structure returned by <a class="reference" href="#sipfindmappedtype">sipFindMappedType()</a>. <em>state</em>
-describes the state of the instance.</dd>
+describes the state of the instance.</p>
+<p class="last">This is deprecated from SIP v4.8. Instead you should use
+<a class="reference" href="#sipreleasetype">sipReleaseType()</a>.</p>
+</dd>
+</dl>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id227" id="sipreleasetype" name="sipreleasetype">9.55 sipReleaseType()</a></h2>
+<dl class="docutils">
+<dt>void sipReleaseType(void *cpp, const sipTypeDef *td, int state)</dt>
+<dd>This destroys a wrapped C/C++ or mapped type instance if it was a temporary
+instance. It is called after a call to either <a class="reference" href="#sipconverttotype">sipConvertToType()</a> or
+<a class="reference" href="#sipforceconverttotype">sipForceConvertToType()</a>. <em>cpp</em> is the wrapped C/C++ instance. <em>td</em> is
+the generated type structure. <em>state</em> describes the state of the instance.</dd>
+</dl>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id228" id="sipresolvetypedef" name="sipresolvetypedef">9.56 sipResolveTypedef()</a></h2>
+<dl class="docutils">
+<dt>const char *sipResolveTypedef(const char *name)</dt>
+<dd>If <em>name</em> refers to a C/C++ typedef then the value of that typedef is
+returned, otherwise <tt class="docutils literal"><span class="pre">NULL</span></tt> is returned.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id216" id="sipstringtypeclassmap" name="sipstringtypeclassmap">9.51 sipStringTypeClassMap</a></h2>
+<h2><a class="toc-backref" href="#id229" id="sipsimplewrapper" name="sipsimplewrapper">9.57 sipSimpleWrapper</a></h2>
+<p>This is a C structure that represents a Python wrapped instance whose type is
+<tt class="docutils literal"><span class="pre">sip.simplewrapper</span></tt>. It is an extension of the <tt class="docutils literal"><span class="pre">PyObject</span></tt> structure and so
+may be safely cast to it.</p>
+<p>It includes a member called <tt class="docutils literal"><span class="pre">user</span></tt> which is of type <tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt>. This can
+be used for any purpose by handwritten code and will automatically be garbage
+collected at the appropriate time.</p>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id230" id="sipsimplewrapper-type" name="sipsimplewrapper-type">9.58 sipSimpleWrapper_Type</a></h2>
+<p>This is a pointer to a <tt class="docutils literal"><span class="pre">PyTypeObject</span></tt> structure that is the type of a
+<a class="reference" href="#sipsimplewrapper">sipSimpleWrapper</a> structure and is the C implementation of
+<tt class="docutils literal"><span class="pre">sip.simplewrapper</span></tt>. It may be safely cast to <a class="reference" href="#sipwrappertype">sipWrapperType</a>.</p>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id231" id="sipstringtypeclassmap" name="sipstringtypeclassmap">9.59 sipStringTypeClassMap</a></h2>
<p>This C structure is used with <a class="reference" href="#sipmapstringtoclass">sipMapStringToClass()</a> to define a mapping
between <tt class="docutils literal"><span class="pre">'\0'</span></tt> terminated string based RTTI and <a class="reference" href="#generated-type-objects">generated type objects</a>.
The structure elements are as follows.</p>
@@ -4810,25 +5134,10 @@ The structure elements are as follows.</p>
<dt>sipWrapperType **pyType.</dt>
<dd>A pointer to the corresponding Python type object.</dd>
</dl>
+<p>This is deprecated from SIP v4.8.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id217" id="siptransfer" name="siptransfer">9.52 sipTransfer()</a></h2>
-<dl class="docutils">
-<dt>void sipTransfer(PyObject *obj, int tocpp)</dt>
-<dd><p class="first">This function is deprecated from SIP v4.3. If <em>tocpp</em> is non-zero then the
-equivalent call is:</p>
-<pre class="literal-block">
-sipTransferTo(obj, obj);
-</pre>
-<p>If <em>tocpp</em> is zero then the equivalent call is:</p>
-<pre class="last literal-block">
-sipTransferBack(obj);
-</pre>
-</dd>
-</dl>
-</div>
-<div class="section">
-<h2><a class="toc-backref" href="#id218" id="siptransferback" name="siptransferback">9.53 sipTransferBack()</a></h2>
+<h2><a class="toc-backref" href="#id232" id="siptransferback" name="siptransferback">9.60 sipTransferBack()</a></h2>
<dl class="docutils">
<dt>void sipTransferBack(PyObject *obj)</dt>
<dd>This transfers ownership of a Python wrapped instance to Python (see
@@ -4838,7 +5147,7 @@ collector with another instance is removed.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id219" id="siptransferbreak" name="siptransferbreak">9.54 sipTransferBreak()</a></h2>
+<h2><a class="toc-backref" href="#id233" id="siptransferbreak" name="siptransferbreak">9.61 sipTransferBreak()</a></h2>
<dl class="docutils">
<dt>void sipTransferBreak(PyObject *obj)</dt>
<dd>Any association of a Python wrapped instance with regard to the cyclic
@@ -4847,7 +5156,7 @@ instance. Ownership of the instance should be with C++.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id220" id="siptransferto" name="siptransferto">9.55 sipTransferTo()</a></h2>
+<h2><a class="toc-backref" href="#id234" id="siptransferto" name="siptransferto">9.62 sipTransferTo()</a></h2>
<dl class="docutils">
<dt>void sipTransferTo(PyObject *obj, PyObject *owner)</dt>
<dd>This transfers ownership of a Python wrapped instance to C++ (see
@@ -4861,75 +5170,160 @@ destructor is always transfered to C++.</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id221" id="sipwrapper" name="sipwrapper">9.56 sipWrapper</a></h2>
-<p>This is a C structure that represents a Python wrapped instance. It is an
-extension of the Python <tt class="docutils literal"><span class="pre">PyObject</span></tt> structure and so may be safely cast to
-<tt class="docutils literal"><span class="pre">PyObject</span></tt>. It includes a member called <tt class="docutils literal"><span class="pre">user</span></tt> which is of type
-<tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt>. This can be used for any purpose by handwritten code and will
-automatically be garbage collected at the appropriate time.</p>
+<h2><a class="toc-backref" href="#id235" id="siptypeaspytypeobject" name="siptypeaspytypeobject">9.63 sipTypeAsPyTypeObject()</a></h2>
+<dl class="docutils">
+<dt>PyTypeObject *sipTypeAsPyTypeObject(sipTypeDef *td)</dt>
+<dd><p class="first">This returns a pointer to the Python type object that SIP creates from a
+generated type structure. <em>td</em> is the type structure.</p>
+<p>If the type structure refers to a C structure or C++ class then it may be
+safely cast to a <a class="reference" href="#sipwrappertype">sipWrapperType</a>.</p>
+<p class="last">If the type structure refers to a mapped type then <tt class="docutils literal"><span class="pre">NULL</span></tt> will be
+returned.</p>
+</dd>
+</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id222" id="sipwrapper-check" name="sipwrapper-check">9.57 sipWrapper_Check()</a></h2>
+<h2><a class="toc-backref" href="#id236" id="siptypefrompytypeobject" name="siptypefrompytypeobject">9.64 sipTypeFromPyTypeObject()</a></h2>
<dl class="docutils">
-<dt>int sipWrapper_Check(PyObject *obj)</dt>
-<dd>This returns a non-zero value if a Python object is a wrapped instance.
-<em>obj</em> is the Python object.</dd>
+<dt>const sipTypeDef *sipTypeFromPyTypeObject(PyTypeObject *py_type)</dt>
+<dd><p class="first">This returns a pointer to the SIP generated type structure for a Python
+type. <em>py_type</em> is the Python type object.</p>
+<p class="last">If the Python type doesn't correspond to a SIP generated type then <tt class="docutils literal"><span class="pre">NULL</span></tt>
+will be returned.</p>
+</dd>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id223" id="sipwrappertype" name="sipwrappertype">9.58 sipWrapperType</a></h2>
-<p>This is a C structure that represents a SIP generated type object. It is an
-extension of the Python <tt class="docutils literal"><span class="pre">PyTypeObject</span></tt> structure (which is itself an
-extension of the Python <tt class="docutils literal"><span class="pre">PyObject</span></tt> structure) and so may be safely cast to
-<tt class="docutils literal"><span class="pre">PyTypeObject</span></tt> (and <tt class="docutils literal"><span class="pre">PyObject</span></tt>).</p>
+<h2><a class="toc-backref" href="#id237" id="siptypeisclass" name="siptypeisclass">9.65 sipTypeIsClass()</a></h2>
+<dl class="docutils">
+<dt>int sipTypeIsClass(sipTypeDef *td)</dt>
+<dd>This returns a non-zero value if the generated type structure refers to a
+C structure or C++ class. <em>td</em> is the type structure.</dd>
+</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id224" id="generated-type-convertors" name="generated-type-convertors">9.59 Generated Type Convertors</a></h2>
-<p>These functions are deprecated from SIP v4.4.</p>
-<p>SIP generates functions for all types being wrapped (including mapped types
-defined with the <a class="reference" href="#mappedtype">%MappedType</a> directive) that convert a Python object to the
-C structure or C++ class instance. The name of this convertor is the name of
-the structure or class prefixed by <tt class="docutils literal"><span class="pre">sipForceConvertTo_</span></tt>.</p>
+<h2><a class="toc-backref" href="#id238" id="siptypeisenum" name="siptypeisenum">9.66 sipTypeIsEnum()</a></h2>
<dl class="docutils">
-<dt>void *sipForceConvertTo_*class*(PyObject *obj, int *iserr)</dt>
-<dd><em>obj</em> is the Python object to convert. If <em>obj</em> is <tt class="docutils literal"><span class="pre">NULL</span></tt> or the
-location pointed to by <em>iserr</em> is non-zero then the conversion is not
-attempted and <tt class="docutils literal"><span class="pre">NULL</span></tt> is returned. If there was an error then the
-location pointed to by <em>iserr</em> is set to a non-zero value, a Python
-exception is raised, and <tt class="docutils literal"><span class="pre">NULL</span></tt> is returned.</dd>
+<dt>int sipTypeIsEnum(sipTypeDef *td)</dt>
+<dd>This returns a non-zero value if the generated type structure refers to a
+named enum. <em>td</em> is the type structure.</dd>
</dl>
-<p>SIP also generates functions for mapped types that convert a C structure or
-C++ class instance to a Python object. The name of this convertor is the name
-of the structure or class prefixed by <tt class="docutils literal"><span class="pre">sipConvertFrom_</span></tt>.</p>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id239" id="siptypeismapped" name="siptypeismapped">9.67 sipTypeIsMapped()</a></h2>
<dl class="docutils">
-<dt>PyObject *sipConvertFrom_*class*(void *cppptr)</dt>
-<dd><em>cppptr</em> is a pointer to the C structure or C++ class instance to convert.
-If there was an error then <tt class="docutils literal"><span class="pre">NULL</span></tt> is returned and a Python exception
-raised.</dd>
+<dt>int sipTypeIsMapped(sipTypeDef *td)</dt>
+<dd>This returns a non-zero value if the generated type structure refers to a
+mapped type. <em>td</em> is the type structure.</dd>
+</dl>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id240" id="siptypeisnamespace" name="siptypeisnamespace">9.68 sipTypeIsNamespace()</a></h2>
+<dl class="docutils">
+<dt>int sipTypeIsNamespace(sipTypeDef *td)</dt>
+<dd>This returns a non-zero value if the generated type structure refers to a
+C++ namespace. <em>td</em> is the type structure.</dd>
+</dl>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id241" id="siptypename" name="siptypename">9.69 sipTypeName()</a></h2>
+<dl class="docutils">
+<dt>const char *sipTypeName(const sipTypeDef *td)</dt>
+<dd>This returns the C/C++ name of a SIP generated type. <em>td</em> is the type
+structure.</dd>
+</dl>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id242" id="siptypescope" name="siptypescope">9.70 sipTypeScope()</a></h2>
+<dl class="docutils">
+<dt>const sipTypeDef *sipTypeScope(const sipTypeDef *td)</dt>
+<dd>This returns the SIP generated type structure of the scope of another
+SIP generated type structure. <tt class="docutils literal"><span class="pre">NULL</span></tt> will be returned if the type has no
+scope.</dd>
+</dl>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id243" id="sipvoidptr-type" name="sipvoidptr-type">9.71 sipVoidPtr_Type</a></h2>
+<p>This is a pointer to a <tt class="docutils literal"><span class="pre">PyTypeObject</span></tt> structure that is the type of a
+<tt class="docutils literal"><span class="pre">PyObject</span></tt> structure that is used to wrap a <tt class="docutils literal"><span class="pre">void</span> <span class="pre">*</span></tt>.</p>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id244" id="sipwrapper" name="sipwrapper">9.72 sipWrapper</a></h2>
+<p>This is a C structure that represents a Python wrapped instance whose type is
+<tt class="docutils literal"><span class="pre">sip.wrapper</span></tt>. It is an extension of the <a class="reference" href="#sipsimplewrapper">sipSimpleWrapper</a> and
+<tt class="docutils literal"><span class="pre">PyObject</span></tt> structures and so may be safely cast to both.</p>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id245" id="sipwrapper-check" name="sipwrapper-check">9.73 sipWrapper_Check()</a></h2>
+<dl class="docutils">
+<dt>int sipWrapper_Check(PyObject *obj)</dt>
+<dd><p class="first">This returns a non-zero value if a Python object is a wrapped instance.
+<em>obj</em> is the Python object.</p>
+<p>This is deprecated from SIP v4.8. Instead you should use the following:</p>
+<pre class="last literal-block">
+PyObject_TypeCheck(obj, sipWrapper_Type)
+</pre>
+</dd>
</dl>
-<p>The convertor functions of all imported types are available to handwritten
-code.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id225" id="generated-type-objects" name="generated-type-objects">9.60 Generated Type Objects</a></h2>
-<p>SIP generates a type object for each C structure or C++ class being wrapped.
-These are <a class="reference" href="#sipwrappertype">sipWrapperType</a> structures and are used extensively by the SIP API.</p>
+<h2><a class="toc-backref" href="#id246" id="sipwrapper-type" name="sipwrapper-type">9.74 sipWrapper_Type</a></h2>
+<p>This is a pointer to a <tt class="docutils literal"><span class="pre">PyTypeObject</span></tt> structure that is the type of a
+<a class="reference" href="#sipwrapper">sipWrapper</a> structure and is the C implementation of <tt class="docutils literal"><span class="pre">sip.wrapper</span></tt>. It may
+be safely cast to <a class="reference" href="#sipwrappertype">sipWrapperType</a>.</p>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id247" id="sipwrappertype" name="sipwrappertype">9.75 sipWrapperType</a></h2>
+<p>This is a C structure that represents a SIP generated type object. It is an
+extension of the <tt class="docutils literal"><span class="pre">PyTypeObject</span></tt> structure (which is itself an extension of
+the <tt class="docutils literal"><span class="pre">PyObject</span></tt> structure) and so may be safely cast to <tt class="docutils literal"><span class="pre">PyTypeObject</span></tt> (and
+<tt class="docutils literal"><span class="pre">PyObject</span></tt>).</p>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id248" id="sipwrappertype-type" name="sipwrappertype-type">9.76 sipWrapperType_Type</a></h2>
+<p>This is a pointer to a <tt class="docutils literal"><span class="pre">PyTypeObject</span></tt> structure that is the type of a
+<a class="reference" href="#sipwrappertype">sipWrapperType</a> structure and is the C implementation of <tt class="docutils literal"><span class="pre">sip.wrappertype</span></tt>.</p>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id249" id="generated-type-structures" name="generated-type-structures">9.77 Generated Type Structures</a></h2>
+<p>SIP generates an opaque type structure for each C structure, C++ class, C++
+namespace, named enum or mapped type being wrapped. These are <tt class="docutils literal"><span class="pre">sipTypeDef</span></tt>
+structures and are used extensively by the SIP API.</p>
+<p>The names of these structure are prefixed by <tt class="docutils literal"><span class="pre">sipType_</span></tt>.</p>
+<p>For those structures that correspond to C structures, C++ classes, C++
+namespaces or named enums the remaining part of the name is the fully
+qualified name of the structure, class, namespace or enum name. Any <tt class="docutils literal"><span class="pre">::</span></tt>
+scope separators are replaced by an underscore. For example, the type object
+for class <tt class="docutils literal"><span class="pre">Klass</span></tt> is <tt class="docutils literal"><span class="pre">sipType_Klass</span></tt>.</p>
+<p>For those structure that correspond to mapped types the remaining part of the
+name is generated by SIP. The only way for handwritten code to obtain a
+pointer to a structure for a mapped type is to use <a class="reference" href="#sipfindtype">sipFindType()</a>.</p>
+<p>The type structures of all imported types are available to handwritten code.</p>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id250" id="generated-type-objects" name="generated-type-objects">9.78 Generated Type Objects</a></h2>
+<p>SIP generates a <a class="reference" href="#sipwrappertype">sipWrapperType</a> type object for each C structure or C++ class
+being wrapped.</p>
<p>These objects are named with the structure or class name prefixed by
<tt class="docutils literal"><span class="pre">sipClass_</span></tt>. For example, the type object for class <tt class="docutils literal"><span class="pre">Klass</span></tt> is
<tt class="docutils literal"><span class="pre">sipClass_Klass</span></tt>.</p>
-<p>The type objects of all imported classes are available to handwritten code.</p>
+<p>Using these names is deprecated from SIP v4.8. Instead use the corresponding
+generated type structure (see <a class="reference" href="#generated-type-structures">Generated Type Structures</a>) and
+<a class="reference" href="#siptypeaspytypeobject">sipTypeAsPyTypeObject()</a>.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id226" id="generated-named-enum-type-objects" name="generated-named-enum-type-objects">9.61 Generated Named Enum Type Objects</a></h2>
+<h2><a class="toc-backref" href="#id251" id="generated-named-enum-type-objects" name="generated-named-enum-type-objects">9.79 Generated Named Enum Type Objects</a></h2>
<p>SIP generates a type object for each named enum being wrapped. These are
PyTypeObject structures. (Anonymous enums are wrapped as Python integers.)</p>
<p>These objects are named with the fully qualified enum name (i.e. including any
enclosing scope) prefixed by <tt class="docutils literal"><span class="pre">sipEnum_</span></tt>. For example, the type object for
enum <tt class="docutils literal"><span class="pre">Enum</span></tt> defined in class <tt class="docutils literal"><span class="pre">Klass</span></tt> is <tt class="docutils literal"><span class="pre">sipEnum_Klass_Enum</span></tt>.</p>
-<p>The type objects of all imported named enums are available to handwritten code.</p>
+<p>Using these names is deprecated from SIP v4.8. Instead use the corresponding
+generated type structure (see <a class="reference" href="#generated-type-structures">Generated Type Structures</a>) and
+<a class="reference" href="#siptypeaspytypeobject">sipTypeAsPyTypeObject()</a>.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id227" id="generated-derived-classes" name="generated-derived-classes">9.62 Generated Derived Classes</a></h2>
+<h2><a class="toc-backref" href="#id252" id="generated-derived-classes" name="generated-derived-classes">9.80 Generated Derived Classes</a></h2>
<p>For most C++ classes being wrapped SIP generates a derived class with the same
name prefixed by <tt class="docutils literal"><span class="pre">sip</span></tt>. For example, the derived class for class <tt class="docutils literal"><span class="pre">Klass</span></tt>
is <tt class="docutils literal"><span class="pre">sipKlass</span></tt>.</p>
@@ -4942,7 +5336,7 @@ exception is that handwritten constructor code specified using the
has the same C++ signature) rather then the wrapped class's constructor.</p>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id228" id="generated-exception-objects" name="generated-exception-objects">9.63 Generated Exception Objects</a></h2>
+<h2><a class="toc-backref" href="#id253" id="generated-exception-objects" name="generated-exception-objects">9.81 Generated Exception Objects</a></h2>
<p>SIP generates a Python object for each exception defined with the <cite>%Exception_</cite>
directive.</p>
<p>These objects are named with the fully qualified exception name (i.e. including
@@ -4953,7 +5347,7 @@ object for enum <tt class="docutils literal"><span class="pre">Except</span></tt
</div>
</div>
<div class="section">
-<h1><a class="toc-backref" href="#id229" id="using-the-sip-api-when-embedding" name="using-the-sip-api-when-embedding">10 Using the SIP API when Embedding</a></h1>
+<h1><a class="toc-backref" href="#id254" id="using-the-sip-api-when-embedding" name="using-the-sip-api-when-embedding">10 Using the SIP API when Embedding</a></h1>
<p>The SIP API described in the previous section is intended to be called from
handwritten code in SIP generated modules. However it is also often necessary
to call it from C or C++ applications that embed the Python interpreter and
@@ -4972,11 +5366,10 @@ name to lower case and preceding it with an underscore. For example:</p>
<p><tt class="docutils literal"><span class="pre">sipWrapperCheck</span></tt> becomes <tt class="docutils literal"><span class="pre">api_wrapper_check</span></tt></p>
</blockquote>
<p>Note that the type objects that SIP generates for a wrapped module (see
-<a class="reference" href="#generated-type-objects">Generated Type Objects</a>, <a class="reference" href="#generated-named-enum-type-objects">Generated Named Enum Type Objects</a> and
+<a class="reference" href="#generated-type-structures">Generated Type Structures</a>, <a class="reference" href="#generated-named-enum-type-objects">Generated Named Enum Type Objects</a> and
<a class="reference" href="#generated-exception-objects">Generated Exception Objects</a>) cannot be refered to directly and must be
-obtained using the <a class="reference" href="#sipfindclass">sipFindClass()</a>, <a class="reference" href="#sipfindmappedtype">sipFindMappedType()</a> and
-<a class="reference" href="#sipfindnamedenum">sipFindNamedEnum()</a> functions. Of course, the corresponding modules must
-already have been imported into the interpreter.</p>
+obtained using the <a class="reference" href="#sipfindtype">sipFindType()</a> function. Of course, the corresponding
+modules must already have been imported into the interpreter.</p>
<p>The following code fragment shows how to get a pointer to the <tt class="docutils literal"><span class="pre">sipAPIDef</span></tt>
data structure:</p>
<pre class="literal-block">
@@ -5013,7 +5406,7 @@ const sipAPIDef *get_sip_api()
</pre>
</div>
<div class="section">
-<h1><a class="toc-backref" href="#id230" id="using-the-sip-module-in-applications" name="using-the-sip-module-in-applications">11 Using the SIP Module in Applications</a></h1>
+<h1><a class="toc-backref" href="#id255" id="using-the-sip-module-in-applications" name="using-the-sip-module-in-applications">11 Using the SIP Module in Applications</a></h1>
<p>The main purpose of the SIP module is to provide functionality common to all
SIP generated bindings. It is loaded automatically and most of the time you
will completely ignore it. However, it does expose some functionality that can
@@ -5064,17 +5457,6 @@ It was first implemented in SIP v4.2.</dd>
<dd>This is a Python string object that defines the SIP version number as
represented as a string. For development snapshots it will start with
<tt class="docutils literal"><span class="pre">snapshot-</span></tt>. It was first implemented in SIP v4.3.</dd>
-<dt>transfer(obj, direction)</dt>
-<dd><p class="first">This function is deprecated from SIP v4.3. If <em>direction</em> is non-zero then
-the equivalent call is:</p>
-<pre class="literal-block">
-sip.transferto(obj, None)
-</pre>
-<p>If <em>direction</em> is zero then the equivalent call is:</p>
-<pre class="last literal-block">
-sip.transferback(obj)
-</pre>
-</dd>
<dt>transferback(obj)</dt>
<dd>This function is a wrapper around <a class="reference" href="#siptransferback">sipTransferBack()</a>.</dd>
<dt>transferto(obj, owner)</dt>
@@ -5132,7 +5514,7 @@ the instance represented as a number. <em>type</em> is the type of the object
</dl>
</div>
<div class="section">
-<h1><a class="toc-backref" href="#id231" id="the-sip-build-system" name="the-sip-build-system">12 The SIP Build System</a></h1>
+<h1><a class="toc-backref" href="#id256" id="the-sip-build-system" name="the-sip-build-system">12 The SIP Build System</a></h1>
<p>The purpose of the build system is to make it easy for you to write
configuration scripts in Python for your own bindings. The build system takes
care of the details of particular combinations of platform and compiler. It
@@ -5153,7 +5535,7 @@ classes intended to be used by the configuration scripts of bindings built on
top of PyQt. The SIP build system includes facilities that do a lot of the
work of creating these additional configuration modules.</p>
<div class="section">
-<h2><a class="toc-backref" href="#id232" id="sipconfig-functions" name="sipconfig-functions">12.1 <tt class="docutils literal"><span class="pre">sipconfig</span></tt> Functions</a></h2>
+<h2><a class="toc-backref" href="#id257" id="sipconfig-functions" name="sipconfig-functions">12.1 <tt class="docutils literal"><span class="pre">sipconfig</span></tt> Functions</a></h2>
<dl class="docutils">
<dt>create_config_module(module, template, content, macros=None)</dt>
<dd><p class="first">This creates a configuration module (e.g. <tt class="docutils literal"><span class="pre">pyqtconfig</span></tt>) from a template
@@ -5261,7 +5643,7 @@ string.</p>
</dl>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id233" id="sipconfig-classes" name="sipconfig-classes">12.2 <tt class="docutils literal"><span class="pre">sipconfig</span></tt> Classes</a></h2>
+<h2><a class="toc-backref" href="#id258" id="sipconfig-classes" name="sipconfig-classes">12.2 <tt class="docutils literal"><span class="pre">sipconfig</span></tt> Classes</a></h2>
<dl class="docutils">
<dt>Configuration</dt>
<dd><p class="first">This class encapsulates configuration values that can be accessed as
@@ -5649,7 +6031,7 @@ extension module.</p>
</div>
</div>
<div class="section">
-<h1><a class="toc-backref" href="#id234" id="building-your-extension-with-distutils" name="building-your-extension-with-distutils">13 Building Your Extension with distutils</a></h1>
+<h1><a class="toc-backref" href="#id259" id="building-your-extension-with-distutils" name="building-your-extension-with-distutils">13 Building Your Extension with distutils</a></h1>
<p>To build the example in <a class="reference" href="#a-simple-c-example">A Simple C++ Example</a> using distutils, it is
sufficient to create a standard <tt class="docutils literal"><span class="pre">setup.py</span></tt>, listing <tt class="docutils literal"><span class="pre">word.sip</span></tt> among the
files to build, and hook-up SIP into distutils:</p>
@@ -5672,7 +6054,7 @@ special line which is needed so that SIP can see and process <tt class="docutils
Then, running <tt class="docutils literal"><span class="pre">setup.py</span> <span class="pre">build</span></tt> will build our extension module.</p>
</div>
<div class="section">
-<h1><a class="toc-backref" href="#id235" id="builtin-modules-and-custom-interpreters" name="builtin-modules-and-custom-interpreters">14 Builtin Modules and Custom Interpreters</a></h1>
+<h1><a class="toc-backref" href="#id260" id="builtin-modules-and-custom-interpreters" name="builtin-modules-and-custom-interpreters">14 Builtin Modules and Custom Interpreters</a></h1>
<p>Sometimes you want to create a custom Python interpreter with some modules
built in to the interpreter itself rather than being dynamically loaded. To
do this the module must be created as a static library and linked with a
doc/sipref.html
@@ -7,7 +7,7 @@
-----------------
:Contact: info@riverbankcomputing.com
-:Version: 4.7.8-snapshot-20081102
+:Version: 4.8-snapshot-20090225
:Copyright: Copyright (c) 2008 Riverbank Computing Limited
.. contents::
@@ -17,7 +17,7 @@
Introduction
============
-This is the reference guide for SIP 4.7.8-snapshot-20081102. SIP is a tool for
+This is the reference guide for SIP 4.8-snapshot-20090225. 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
@@ -90,6 +90,9 @@ SIP, and the bindings it produces, have the following features.
information to ensure that the class of a Python instance object matches
the class of the corresponding C++ instance
+ - the ability to change the type and meta-type of the Python object used to
+ wrap a C/C++ data type
+
- full support of the Python global interpreter lock, including the ability
to specify that a C++ function of method may block, therefore allowing
the lock to be released and other Python threads to run
@@ -176,6 +179,101 @@ SIP itself does not require Qt to be installed.
Potential Incompatibilities with Earlier Versions
=================================================
+SIP v4.8
+--------
+
+Prior to this version the `sipWrapper`_ structure had a member called ``user``
+which is available for handwritten code to use. From this version ``user`` is
+a member of the `sipSimpleWrapper`_ structure. `sipWrapper`_ pointers can be
+safely cast to `sipSimpleWrapper`_ pointers, so if your code does something
+like::
+
+ ((sipWrapper *)obj)->user = an_object_reference;
+
+then you just need to change it to::
+
+ ((sipSimpleWrapper *)obj)->user = an_object_reference;
+
+The generated class names are now ``const char *`` rather than ``char *``.
+
+The following deprecated parts of the API have been removed.
+
+ - The ``a``, ``A``, ``M``, ``N``, ``O``, ``P`` and ``T`` format characters
+ from `sipBuildResult()`_ and `sipCallMethod()`_.
+
+ - The ``a``, ``A``, ``L`` and ``M`` format characters from
+ `sipParseResult()`_.
+
+ - ``sipConvertToCpp()``, ``sipIsSubClassInstance()`` and ``sipTransfer()``.
+
+ - The old-style generated type convertors.
+
+ - The ``transfer()`` function of the ``sip`` module.
+
+In addition the deprecated ``-a`` command line option to ``configure.py`` has
+been removed.
+
+The following parts of the API are now deprecated (but still supported).
+
+ - The `Generated Type Objects`_.
+
+ - The `Generated Named Enum Type Objects`_.
+
+ - `sipConvertFromInstance()`_
+
+ - `sipConvertFromMappedType()`_
+
+ - `sipConvertFromNamedEnum()`_
+
+ - `sipConvertFromNewInstance()`_
+
+ - `sipCanConvertToInstance()`_
+
+ - `sipCanConvertToMappedType()`_
+
+ - `sipConvertToInstance()`_
+
+ - `sipConvertToMappedType()`_
+
+ - `sipForceConvertToInstance()`_
+
+ - `sipForceConvertToMappedType()`_
+
+ - `sipClassName()`_
+
+ - `sipFindClass()`_
+
+ - `sipFindNamedEnum()`_
+
+ - `sipFindMappedType()`_
+
+ - `sipGetWrapper()`_
+
+ - `sipReleaseInstance()`_
+
+ - `sipReleaseMappedType()`_
+
+ - `sipWrapper_Check()`_
+
+ - The ``B``, ``C`` and ``E`` format characters of `sipBuildResult()`_ and
+ `sipCallMethod()`_.
+
+ - The ``C`` and ``E`` format character of `sipParseResult()`_.
+
+The following PyQt-specific support functions have been removed.
+
+ - ``sipConnectRx()``
+
+ - ``sipDisconnectRx()``
+
+ - ``sipEmitSlot()``
+
+ - ``sipGetSender()``
+
+The handling of virtual methods in `%MethodCode`_ has been simplified slightly
+and the ``sipProtectVirt_*()`` functions are no longer generated.
+
+
SIP v4.7.8
----------
@@ -206,13 +304,11 @@ SIP v4.4
- The ``SIP_BUILD`` C preprocessor symbol has been removed.
- - `sipConvertToCpp()`_, `sipIsSubClassInstance()`_ and the old `Generated
- Type Convertors`_ have been deprecated. The functions
- `sipCanConvertToInstance()`_, `sipConvertToInstance()`_,
- `sipForceConvertToInstance()`_, `sipConvertFromInstance()`_,
- `sipConvertFromNewInstance()`_, `sipCanConvertToMappedType()`_,
- `sipConvertToMappedType()`_, `sipForceConvertToMappedType()`_ and
- `sipConvertFromMappedType()`_ should be used instead. Handwritten
+ - ``sipConvertToCpp()``, ``sipIsSubClassInstance()`` and the old-style
+ generated type convertors have been deprecated. The functions
+ `sipCanConvertToType()`_, `sipConvertToType()`_,
+ `sipForceConvertToType()`_, `sipConvertFromType()`_ and
+ `sipConvertFromNewType()`_ should be used instead. Handwritten
`%ConvertFromTypeCode`_ and `%ConvertToTypeCode`_ now has the
responsibility for using these to implement the ``Transfer`` and
``TransferBack`` annotations.
@@ -254,11 +350,6 @@ interpreter for which you wish SIP to generate bindings for.
The full set of command line options is:
-h Display a help message.
--a Export all symbols in any SIP generated module and the SIP module
- itself. This was the default behaviour of SIP prior to v4.2.
- Normally only a module's inititialisation function is exported. This
- option is deprecated as the ``ModuleMakefile`` class of `The SIP Build
- System`_ allows this to be specified on a per module basis.
-b dir The SIP code generator will be installed in the directory ``dir``.
-d dir The SIP module will be installed in the directory ``dir``.
-e dir The SIP header file will be installed in the directory ``dir``.
@@ -806,6 +897,65 @@ heap using the ``free()`` function.
See also `sipTransferTo()`_, `sipTransferBack()`_ and `sipTransferBreak()`_.
+Types and Meta-types
+--------------------
+
+Every Python object (with the exception of the ``object`` object itself) has a
+meta-type and at least one super-type. By default an object's meta-type is the
+meta-type of its first super-type.
+
+SIP implements two super-types, ``sip.simplewrapper`` and ``sip.wrapper``, and
+a meta-type, ``sip.wrappertype``.
+
+``sip.simplewrapper`` is the super-type of ``sip.wrapper``. The super-type of
+``sip.simplewrapper`` is ``object``.
+
+``sip.wrappertype`` is the meta-type of both ``sip.simplewrapper`` and
+``sip.wrapper``. The super-type of ``sip.wrappertype`` is ``type``.
+
+``sip.wrapper`` supports the concept of object ownership described in
+`Ownership of Objects`_ and, by default, is the super-type of all the types
+that SIP generates.
+
+``sip.simplewrapper`` does not support the concept of object ownership but SIP
+generated types that are sub-classed from it have Python objects that take less
+memory.
+
+SIP allows a class's meta-type and super-type to be explicitly specified using
+the `Metatype`_ and `Supertype`_ class annotations.
+
+SIP also allows the default meta-type and super-type to be changed for a module
+using the `%DefaultMetatype`_ and `%DefaultSupertype`_ directives.
+
+If you want to use your own meta-type or super-type then they must be
+sub-classed from one of the SIP provided types. Your types must be registered
+using `sipRegisterPyType()`_. This is normally done in code specified using
+the `%InitialisationCode`_ directive.
+
+As an example, PyQt4 uses `%DefaultMetatype`_ to specify a new meta-type that
+handles the interaction with Qt's own meta-type system. It also uses
+`%DefaultSupertype`_ to specify that the smaller ``sip.simplewrapper``
+super-type is normally used. Finally it uses `Supertype`_ as an annotation of
+the ``QObject`` class to override the default and use ``sip.wrapper`` as the
+super-type so that the parent/child relationships of ``QObject`` instances are
+properly maintained.
+
+
+Lazy Type Attributes
+--------------------
+
+Instead of populating a wrapped type's dictionary with its attributes (or
+descriptors for those attributes) SIP only creates objects for those attributes
+when they are actually needed. This is done to reduce the memory footprint and
+start up time when used to wrap large libraries with hundreds of classes and
+tens of thousands of attributes.
+
+SIP allows you to extend the handling of lazy attributes to your own attribute
+types by allowing you to register an attribute getter handler (using
+`sipRegisterAttributeGetter()`_). This will be called just before a type's
+dictionary is accessed for the first time.
+
+
Support for Python's Buffer Interface
-------------------------------------
@@ -987,17 +1137,14 @@ file.
*module-statement* ::= [*module-directive* | *statement*]
*module-directive* ::= [`%CModule`_ | `%CompositeModule`_ |
- `%ConsolidatedModule`_ | `%Copying`_ | `%Doc`_ | `%ExportedDoc`_ |
+ `%ConsolidatedModule`_ | `%Copying`_ | `%DefaultMetatype`_ |
+ `%DefaultSupertype`_ | `%Doc`_ | `%ExportedDoc`_ |
`%ExportedHeaderCode`_ | `%Feature`_ | `%Import`_ | `%Include`_ |
- `%License`_ | `%MappedType`_ | *mapped-type-template* |
- `%Module`_ | `%ModuleCode`_ | `%ModuleHeaderCode`_ |
- `%OptionalInclude`_ | `%Platforms`_ | `%PreInitialisationCode`_ |
- `%PostInitialisationCode`_ | *sip-option-list* | `%Timeline`_ |
- `%UnitCode`_]
-
- *sip-option-list* :: `%SIPOptions`_ ``(`` *option-list* ``)``
-
- *option-list* ::= *option* [``,`` *option-list*]
+ `%InitialisationCode`_ | `%License`_ | `%MappedType`_ |
+ *mapped-type-template* | `%Module`_ | `%ModuleCode`_ |
+ `%ModuleHeaderCode`_ | `%OptionalInclude`_ | `%Platforms`_ |
+ `%PreInitialisationCode`_ | `%PostInitialisationCode`_ |
+ `%Timeline`_ | `%UnitCode`_]
*statement* :: [*class-statement* | *function* | *variable*]
@@ -1206,6 +1353,8 @@ file.
*template* ::= *scoped-name* ``<`` *type-list* ``>``
+ *dotted-name* ::= *name* [``.`` *dotted-name*]
+
*name* ::= _A-Za-z {_A-Za-z0-9}
Here is a short list of differences between C++ and the subset supported by
@@ -1673,7 +1822,7 @@ list of ``QWidget`` instances::
// Get the Python wrapper for the QWidget instance, creating a new
// one if necessary, and handle any ownership transfer.
- if ((wobj = sipConvertFromInstance(w, sipClass_QWidget, sipTransferObj)) == NULL)
+ if ((wobj = sipConvertFromType(w, sipType_QWidget, sipTransferObj)) == NULL)
{
// There was an error so garbage collect the Python list.
Py_DECREF(l);
@@ -1732,6 +1881,14 @@ void \*\*sipCppRet
C++ address of the instance when cast (usually using ``static_cast``)
from the super-class to the sub-class.
+const sipTypeDef \*sipType
+ The handwritten code must set this to the SIP generated type structure
+ that corresponds to the class instance. (The type structure for class
+ ``Klass`` is ``sipType_Klass``.) If the RTTI of the class instance isn't
+ recognised then ``sipType`` must be set to ``NULL``. The code doesn't
+ have to recognise the exact class, only the most specific sub-class that
+ it can.
+
sipWrapperType \*sipClass
The handwritten code must set this to the SIP generated Python type object
that corresponds to the class instance. (The type object for class
@@ -1740,6 +1897,8 @@ sipWrapperType \*sipClass
have to recognise the exact class, only the most specific sub-class that
it can.
+ This is deprecated from SIP v4.8. Instead you should use ``sipType``.
+
The handwritten code must not explicitly return.
The following example shows the sub-class conversion code for ``QEvent`` based
@@ -1749,22 +1908,22 @@ class hierarchy in PyQt::
{
%ConvertToSubClassCode
// QEvent sub-classes provide a unique type ID.
- switch (sipCpp -> type())
+ switch (sipCpp->type())
{
case QEvent::Timer:
- sipClass = sipClass_QTimerEvent;
+ sipType = sipType_QTimerEvent;
break;
case QEvent::KeyPress:
case QEvent::KeyRelease:
- sipClass = sipClass_QKeyEvent;
+ sipType = sipType_QKeyEvent;
break;
// Skip the remaining event types to keep the example short.
default:
// We don't recognise the type.
- sipClass = NULL;
+ sipType = NULL;
}
%End
@@ -1772,10 +1931,6 @@ class hierarchy in PyQt::
};
-The SIP API includes the `sipMapIntToClass()`_ and `sipMapStringToClass()`_
-functions that convert integer and string based RTTI to Python type objects
-based on ordered lookup tables.
-
%ConvertToTypeCode
------------------
@@ -1855,8 +2010,8 @@ The following example converts a Python list of ``QPoint`` instances to a
// disallow None because it is a list of QPoint, not of a pointer
// to a QPoint, so None isn't appropriate.
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i),
- sipClass_QPoint, SIP_NOT_NONE))
+ if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i),
+ sipType_QPoint, SIP_NOT_NONE))
return 0;
// The type is valid.
@@ -1874,16 +2029,16 @@ The following example converts a Python list of ``QPoint`` instances to a
// Get the address of the element's C++ instance. Note that, in
// this case, we don't apply any ownership changes to the list
// elements, only to the list itself.
- qp = reinterpret_cast<QPoint *>(sipConvertToInstance(
+ qp = reinterpret_cast<QPoint *>(sipConvertToType(
PyList_GET_ITEM(sipPy, i),
- sipClass_QPoint, 0,
+ sipType_QPoint, 0,
SIP_NOT_NONE,
&state, sipIsErr));
// Deal with any errors.
if (*sipIsErr)
{
- sipReleaseInstance(qp, sipClass_QPoint, state);
+ sipReleaseType(qp, sipType_QPoint, state);
// Tidy up.
delete ql;
@@ -1897,8 +2052,8 @@ The following example converts a Python list of ``QPoint`` instances to a
// A copy of the QPoint was appended to the list so we no longer
// need it. It may be a temporary instance that should be
// destroyed, or a wrapped instance that should not be destroyed.
- // sipReleaseInstance() will do the right thing.
- sipReleaseInstance(qp, sipClass_QPoint, state);
+ // sipReleaseType() will do the right thing.
+ sipReleaseType(qp, sipType_QPoint, state);
}
// Return the instance.
@@ -1915,10 +2070,9 @@ When used in a class specification the handwritten code replaces the code that
would normally be automatically generated. This means that the handwritten
code must also handle instances of the class itself and not just the additional
types that are being supported. This should be done by making calls to
-`sipCanConvertToInstance()`_ to check the object type and
-`sipConvertToInstance()`_ to convert the object. The ``SIP_NO_CONVERTORS``
-flag *must* be passed to both these functions to prevent recursive calls to the
-handwritten code.
+`sipCanConvertToType()`_ to check the object type and `sipConvertToType()`_ to
+convert the object. The ``SIP_NO_CONVERTORS`` flag *must* be passed to both
+these functions to prevent recursive calls to the handwritten code.
%Copying
@@ -1937,10 +2091,54 @@ include copyright and licensing terms.
For example::
%Copying
- Copyright (c) 2007 Riverbank Computing Limited
+ Copyright (c) 2008 Riverbank Computing Limited
%End
+%DefaultMetatype
+----------------
+
+.. parsed-literal::
+
+ %DefaultMetatype *dotted-name*
+
+This directive is used to specify the Python type that should be used as the
+meta-type for any C/C++ data type that doesn't have an explicit super-type.
+
+If this is not specified then ``sip.wrappertype`` is used.
+
+You can also use the `Metatype`_ class annotation to specify the meta-type
+used by a particular C/C++ type.
+
+See the section `Types and Meta-types`_ for more details.
+
+For example::
+
+ %DefaultMetatype PyQt4.QtCore.pyqtWrapperType
+
+
+%DefaultSupertype
+-----------------
+
+.. parsed-literal::
+
+ %DefaultSupertype *dotted-name*
+
+This directive is used to specify the Python type that should be used as the
+super-type for any C/C++ data type that doesn't have an explicit super-type.
+
+If this is not specified then ``sip.wrapper`` is used.
+
+You can also use the `Supertype`_ class annotation to specify the super-type
+used by a particular C/C++ type.
+
+See the section `Types and Meta-types`_ for more details.
+
+For example::
+
+ %DefaultSupertype sip.simplewrapper
+
+
%Doc
----
@@ -2335,6 +2533,7 @@ following parts of a specification are affected by it:
- `%GCClearCode`_
- `%GCTraverseCode`_
- `%If`_
+ - `%InitialisationCode`_
- `%MappedType`_
- `%MethodCode`_
- `%ModuleCode`_
@@ -2396,6 +2595,30 @@ For example::
%Include qwidget.sip
+%InitialisationCode
+-------------------
+
+.. parsed-literal::
+
+ %InitialisationCode
+ *code*
+ %End
+
+This directive is used to specify handwritten code that is embedded in-line
+in the generated module initialisation code after the SIP module has been
+imported but before the module itself has been intialised.
+
+It is typically used to call `sipRegisterPyType()`_.
+
+For example::
+
+ %InitialisationCode
+ // The code will be executed when the module is first imported, after
+ // the SIP module has been imported, but before other module-specific
+ // initialisation has been completed.
+ %End
+
+
%License
--------
@@ -2484,8 +2707,8 @@ For example::
// Now check each element of the list is of the type we expect.
// The template is for a pointer type so we don't disallow None.
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i),
- sipClass_Type, 0))
+ if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i),
+ sipType_Type, 0))
return 0;
return 1;
@@ -2499,9 +2722,9 @@ For example::
// Use the SIP API to convert the Python object to the
// corresponding C++ instance. Note that we apply any ownership
// transfer to the list itself, not the individual elements.
- Type *t = reinterpret_cast<Type *>(sipConvertToInstance(
+ Type *t = reinterpret_cast<Type *>(sipConvertToType(
PyList_GET_ITEM(sipPy, i),
- sipClass_Type, 0, 0, 0,
+ sipType_Type, 0, 0, 0,
sipIsErr));
if (*sipIsErr)
@@ -2538,7 +2761,7 @@ For example::
Type *t = sipCpp -> at(i);
PyObject *tobj;
- if ((tobj = sipConvertFromInstance(t, sipClass_Type, sipTransferObj)) == NULL)
+ if ((tobj = sipConvertFromType(t, sipType_Type, sipTransferObj)) == NULL)
{
// There was an error so garbage collect the Python list.
Py_DECREF(l);
@@ -2666,17 +2889,6 @@ PyObject \*sipSelf
or method then this is the Python object that wraps the the structure or
class instance, i.e. ``self``.
-bool sipSelfWasArg
- This is only made available for non-abstract, virtual methods. It is set
- if ``self`` was explicitly passed as the first argument of the method
- rather than being bound to the method. In other words, the call was::
-
- Klass.foo(self, ...)
-
- rather than::
-
- self.foo(...)
-
If the `NoArgParser`_ annotation has been used then only the following
variables are made available to the handwritten code:
@@ -2701,8 +2913,7 @@ The following is a complete example::
if (PyArg_ParseTuple(a0, "ii", &iarr[0], &iarr[1]))
{
Py_BEGIN_ALLOW_THREADS
- sipRes = sipSelfWasArg ? sipCpp -> Klass::foo(iarr)
- : sipCpp -> foo(iarr);
+ sipCpp -> Klass::foo(iarr);
Py_END_ALLOW_THREADS
}
else
@@ -2713,17 +2924,12 @@ The following is a complete example::
%End
};
-As the example is a virtual method [#]_, note the use of ``sipSelfWasArg`` to
+As the example is a virtual method [#]_, note the use of an explicit scope to
determine exactly which implementation of ``foo()`` to call.
If a method is in the ``protected`` section of a C++ class then the call
should instead be::
- sipRes = sipCpp -> sipProtectVirt_foo(sipSelfWasArg, iarr);
-
-If a method is in the ``protected`` section of a C++ class but is not virtual
-then the call should instead be::
-
sipRes = sipCpp -> sipProtect_foo(iarr);
.. [#] See `%VirtualCatcherCode`_ for a description of how SIP generated code
@@ -3017,14 +3223,6 @@ PyObject \*sipPyType
See the `%GetCode`_ directive for an example.
-%SIPOptions
------------
-
-This directive sets one or more options that controls different aspects of
-SIP's behaviour. In this version all the available options are provided
-specifically to support PyQt and so are not documented.
-
-
%Timeline
---------
@@ -3265,6 +3463,10 @@ name
The value is a name that is compatible with a C/C++ identifier. In some
cases the value is optional.
+dotted name
+ The value is a name that is compatible with an identifier preceded by a
+ Python scope.
+
string
The value is a double quoted string.
@@ -3525,6 +3727,16 @@ module. Declarations of external classes are private to the module in which
they appear.
+Metatype
+********
+
+This dotted name annotation specifies the name of the Python type object (i.e.
+the value of the ``tp_name`` field) used as the meta-type used when creating
+the type object for this C structure or C++ type.
+
+See the section `Types and Meta-types`_ for more details.
+
+
NoDefaultCtors
**************
@@ -3542,6 +3754,16 @@ clashes with other objects (e.g. enums, exceptions, functions) that have the
same name in the same C++ scope.
+Supertype
+*********
+
+This dotted name annotation specifies the name of the Python type object (i.e.
+the value of the ``tp_name`` field) used as the super-type used when creating
+the type object for this C structure or C++ type.
+
+See the section `Types and Meta-types`_ for more details.
+
+
Mapped Type Annotations
-----------------------
@@ -3549,9 +3771,9 @@ NoRelease
*********
This boolean annotation is used to specify that the mapped type does not
-support the `sipReleaseMappedType()`_ function. Any `%ConvertToTypeCode`_
-should not create temporary instances of the mapped type, i.e. it should not
-return ``SIP_TEMPORARY``.
+support the `sipReleaseType()`_ function. Any `%ConvertToTypeCode`_ should not
+create temporary instances of the mapped type, i.e. it should not return
+``SIP_TEMPORARY``.
Enum Annotations
@@ -3928,11 +4150,6 @@ PyObject \*sipBuildResult(int \*iserr, const char \*format, ...)
will create, and the entry in brackets are the types of the C/C++ values
to be passed.
- ``a`` (string) [char \*, int]
- Convert a C/C++ character array and its length to a Python string. If
- the array is ``NULL`` then the length is ignored and the result is
- ``Py_None``. This is deprecated, use ``g`` instead.
-
``b`` (boolean) [int]
Convert a C/C++ ``int`` to a Python boolean.
@@ -3989,11 +4206,6 @@ PyObject \*sipBuildResult(int \*iserr, const char \*format, ...)
unicode object. If the string pointer is ``NULL`` then the result is
``Py_None``.
- ``A`` (unicode) [wchar_t \*, int]
- Convert a C/C++ wide character array and its length to a Python unicode
- object. If the array is ``NULL`` then the length is ignored and the
- result is ``Py_None``. This is deprecated, use ``G`` instead.
-
``B`` (wrapped instance) [*type* \*, sipWrapperType \*, PyObject \*]
Convert a new C structure or a new C++ class instance to a Python class
instance object. Ownership of the structure or instance is determined
@@ -4004,6 +4216,8 @@ PyObject \*sipBuildResult(int \*iserr, const char \*format, ...)
``PyObject *`` argument. The Python class is influenced by any
applicable `%ConvertToSubClassCode`_ code.
+ This is deprecated from SIP v4.8. Instead you should use ``N``.
+
``C`` (wrapped instance) [*type* \*, sipWrapperType \*, PyObject \*]
Convert a C structure or a C++ class instance to a Python class
instance object. If the structure or class instance has already been
@@ -4018,54 +4232,45 @@ PyObject \*sipBuildResult(int \*iserr, const char \*format, ...)
via a call to `sipTransferTo()`_. The Python class is influenced by
any applicable `%ConvertToSubClassCode`_ code.
- ``D`` (object) [*type* \*, const sipMappedType \*, PyObject \*]
- Convert a C structure or a C++ class instance wrapped as a mapped type
- to a Python object. Ownership of the structure or instance is
- determined by the ``PyObject *`` argument. If it is ``NULL`` then the
- ownership is unchanged. If it is ``Py_None`` then ownership is
- transferred to Python via a call to `sipTransferBack()`_. Otherwise
- ownership is transferred to C/C++ and the instance associated with the
- ``PyObject *`` argument via a call to `sipTransferTo()`_.
+ This is deprecated from SIP v4.8. Instead you should use ``D``.
+
+ ``D`` (wrapped instance) [*type* \*, const sipTypeDef \*, PyObject \*]
+ Convert a C structure, C++ class or mapped type instance to a Python
+ object. If the instance has already been wrapped then the result is a
+ new reference to the existing object. Ownership of the instance is
+ determined by the ``PyObject *`` argument. If it is ``NULL`` and the
+ instance has already been wrapped then the ownership is unchanged. If
+ it is ``NULL`` and the instance is newly wrapped then ownership will be
+ with C/C++. If it is ``Py_None`` then ownership is transferred to
+ Python via a call to `sipTransferBack()`_. Otherwise ownership is
+ transferred to C/C++ and the instance associated with the
+ ``PyObject *`` argument via a call to `sipTransferTo()`_. The Python
+ class is influenced by any applicable `%ConvertToSubClassCode`_ code.
``E`` (wrapped enum) [enum, PyTypeObject \*]
Convert a named C/C++ ``enum`` to an instance of the corresponding
Python named enum type.
+ This is deprecated from SIP v4.8. Instead you should use ``F``.
+
+ ``F`` (wrapped enum) [enum, sipTypeDef \*]
+ Convert a named C/C++ ``enum`` to an instance of the corresponding
+ Python named enum type.
+
``G`` (unicode) [wchar_t \*, SIP_SSIZE_T]
Convert a C/C++ wide character array and its length to a Python unicode
object. If the array is ``NULL`` then the length is ignored and the
result is ``Py_None``.
- ``M`` (wrapped instance) [*type* \*, sipWrapperType \*]
- Convert a C structure or a C++ class instance to a Python class
- instance object. If the structure or class instance has already been
- wrapped then the result is a new reference to the existing class
- instance object. If the instance has already been wrapped then the
- ownership is unchanged. If the instance is newly wrapped then
- ownership will be with C/C++. The Python class is influenced by any
- applicable `%ConvertToSubClassCode`_ code. This is deprecated from
- SIP v4.4.
-
- ``N`` (wrapped instance) [*type* \*, sipWrapperType \*]
- Convert a C structure or a C++ class instance to a Python class
- instance object. This should not be used if the structure or class
- instance might already have been wrapped. Ownership of the structure
- or instance will be with Python. The Python class is influenced by
- any applicable `%ConvertToSubClassCode`_ code. This is deprecated
- from SIP v4.4.
-
- ``O`` (wrapped instance) [*type* \*, sipWrapperType \*]
- Convert a C structure or a C++ class instance to a Python class
- instance object. If the structure or class instance has already been
- wrapped then the result is a new reference to the existing class
- instance object. Ownership of the structure or instance will be with
- C/C++. This is deprecated from SIP v4.4.
-
- ``P`` (wrapped instance) [*type* \*, sipWrapperType \*]
- Convert a C structure or a C++ class instance to a Python class
- instance object. This should not be used if the structure or class
- instance might already have been wrapped. Ownership of the structure
- or instance will be with Python. This is deprecated from SIP v4.4.
+ ``N`` (wrapped instance) [*type* \*, sipTypeDef \*, PyObject \*]
+ Convert a new C structure, C++ class or mapped type instance to a
+ Python object. Ownership of the instance is determined by the
+ ``PyObject *`` argument. If it is ``NULL`` and the instance has
+ already been wrapped then the ownership is unchanged. If it is
+ ``NULL`` or ``Py_None`` then ownership will be with Python. Otherwise
+ ownership will be with C/C++ and the instance associated with the
+ ``PyObject *`` argument. The Python class is influenced by any
+ applicable `%ConvertToSubClassCode`_ code.
``R`` (object) [PyObject \*]
The result is value passed without any conversions. The reference
@@ -4075,11 +4280,6 @@ PyObject \*sipBuildResult(int \*iserr, const char \*format, ...)
The result is value passed without any conversions. The reference
count is incremented.
- ``T`` (object) [void \*, PyObject \*(\*)(void \*cppptr)]
- Convert a C structure or a C++ class instance to a Python object using
- a convertor function. See `Generated Type Convertors`_. This is
- deprecated from SIP v4.4.
-
``V`` (sip.voidptr) [void \*]
Convert a C/C++ ``void *`` Python ``sip.voidptr`` object.
@@ -4116,6 +4316,9 @@ int sipCanConvertToInstance(PyObject \*obj, sipWrapperType \*type, int flags)
- ``SIP_NO_CONVERTORS`` suppresses the use of of any
`%ConvertToTypeCode`_ for *type*.
+ This is deprecated from SIP v4.8. Instead you should use
+ `sipCanConvertToType()`_.
+
sipCanConvertToMappedType()
---------------------------
@@ -4129,6 +4332,25 @@ int sipCanConvertToMappedType(PyObject \*obj, const sipMappedType \*mt, int flag
- ``SIP_NOT_NONE`` causes the check to fail if *obj* is ``None``.
+ This is deprecated from SIP v4.8. Instead you should use
+ `sipCanConvertToType()`_.
+
+
+sipCanConvertToType()
+---------------------
+
+int sipCanConvertToType(PyObject \*obj, const sipTypeDef \*td, int flags)
+ This returns a non-zero value if a Python object can be converted to an
+ instance of a C structure, C++ class or mapped type. *obj* is the Python
+ object. *td* is the generated type structure corresponding to the C/C++
+ type being checked. *flags* is any combination of the following values
+ used to fine tune the check.
+
+ - ``SIP_NOT_NONE`` causes the check to fail if *obj* is ``None``.
+
+ - ``SIP_NO_CONVERTORS`` suppresses the use of of any
+ `%ConvertToTypeCode`_ for *td*. It is ignored for mapped types.
+
sipClassName()
--------------
@@ -4137,21 +4359,9 @@ PyObject \*sipClassName(PyObject \*obj)
This returns the class name of a wrapped instance as a Python string. It
comes with a reference.
+ This is deprecated from SIP v4.8. Instead you should use the following::
-sipConnectRx()
---------------
-
-PyObject \*sipConnectRx(PyObject \*sender, const char \*signal, PyObject \*receiver, const char \*slot, int type)
- This connects a signal to a signal or slot and returns ``Py_True`` if the
- signal was connected or ``Py_False`` if not. If there was some other
- error then a Python exception is raised and ``NULL`` is returned. *sender*
- is the wrapped ``QObject`` derived instance that emits the signal.
- *signal* is the typed name of the signal. *receiver* is the wrapped
- ``QObject`` derived instance or Python callable that the signal is
- connected to. *slot* is the typed name of the slot, or ``NULL`` if
- *receiver* is a Python callable. *type* is the type of connection and is
- cast from Qt::ConnectionType. It is normally only used by PyQt to
- implement ``QObject.connect()``.
+ PyString_FromString(obj->ob_type->tp_name)
sipConvertFromConstVoidPtr()
@@ -4173,6 +4383,16 @@ PyObject \*sipConvertFromConstVoidPtrAndSize(const void \*cpp, SIP_SSIZE_T size)
object.
+sipConvertFromEnum()
+--------------------
+
+PyObject \*sipConvertFromEnum(int eval, const sipTypeDef \*td)
+ This converts a named C/C++ ``enum`` to an instance of the corresponding
+ generated Python named enum type. *eval* is the enumerated value to
+ convert. *td* is the generated Python type structure (see `Generated Type
+ Structures`_).
+
+
sipConvertFromInstance()
------------------------
@@ -4192,6 +4412,9 @@ PyObject \*sipConvertFromInstance(void \*cpp, sipWrapperType \*type, PyObject \*
`sipTransferTo()`_. The Python class is influenced by any applicable
`%ConvertToSubClassCode`_ code.
+ This is deprecated from SIP v4.8. Instead you should use
+ `sipConvertFromType()`_.
+
sipConvertFromMappedType()
--------------------------
@@ -4206,6 +4429,9 @@ PyObject \*sipConvertFromMappedType(void \*cpp, const sipMappedType \*mt, PyObje
C/C++ and the instance associated with the ``PyObject *`` argument via a
call to `sipTransferTo()`_.
+ This is deprecated from SIP v4.8. Instead you should use
+ `sipConvertFromType()`_.
+
sipConvertFromNamedEnum()
-------------------------
@@ -4216,6 +4442,9 @@ PyObject \*sipConvertFromNamedEnum(int eval, PyTypeObject \*type)
is the generated Python type object (see `Generated Named Enum Type
Objects`_).
+ This is deprecated from SIP v4.8. Instead you should use
+ `sipConvertFromEnum()`_.
+
sipConvertFromNewInstance()
---------------------------
@@ -4229,6 +4458,22 @@ PyObject \*sipConvertFromNewInstance(void \*cpp, sipWrapperType \*type, PyObject
the instance associated with *transferObj*. The Python class is influenced
by any applicable `%ConvertToSubClassCode`_ code.
+ This is deprecated from SIP v4.8. Instead you should use
+ `sipConvertFromNewType()`_.
+
+
+sipConvertFromNewType()
+-----------------------
+
+PyObject \*sipConvertFromNewType(void \*cpp, const sipTypeDef \*td, PyObject \*transferObj)
+ This converts a new C structure, C++ class or mapped type instance to a
+ Python object. *cpp* is the C/C++ instance. *td* is the generated type
+ structure corresponding to the C/C++ type. *transferObj* controls the
+ ownership of the returned value. If it is ``NULL`` or ``Py_None`` then
+ ownership will be with Python. Otherwise ownership will be with C/C++ and
+ the instance associated with *transferObj*. The Python class is influenced
+ by any applicable `%ConvertToSubClassCode`_ code.
+
sipConvertFromSequenceIndex()
-----------------------------
@@ -4250,6 +4495,26 @@ int sipConvertFromSliceObject(PyObject \*slice, SIP_SSIZE_T length, SIP_SSIZE_T
compatible with SIP v3.x and versions of Python earlier that v2.3.
+sipConvertFromType()
+--------------------
+
+PyObject \*sipConvertFromType(void \*cpp, const sipTypeDef \*td, PyObject \*transferObj)
+ This converts a C structure, a C++ class instance or a mapped type to a
+ Python object. *cpp* is the C/C++ instance. If the instance has already
+ been wrapped then the result is a new reference to the existing object.
+ *td* is the generated type structure corresponding to the C/C++ type.
+ *transferObj* controls the ownership of the returned value. If the
+ structure or class instance has already been wrapped then the result is a
+ new reference to the existing object. If it is ``NULL`` and the instance
+ has already been wrapped then the ownership is unchanged. If it is
+ ``NULL`` and the instance is newly wrapped then ownership will be with
+ C/C++. If it is ``Py_None`` then ownership is transferred to Python via a
+ call to `sipTransferBack()`_. Otherwise ownership is transferred to C/C++
+ and the instance associated with *transferObj* via a call to
+ `sipTransferTo()`_. The Python class is influenced by any applicable
+ `%ConvertToSubClassCode`_ code.
+
+
sipConvertFromVoidPtr()
-----------------------
@@ -4268,15 +4533,6 @@ PyObject \*sipConvertFromVoidPtrAndSize(void \*cpp, SIP_SSIZE_T size)
object.
-sipConvertToCpp()
------------------
-
-void \*sipConvertToCpp(PyObject \*obj, sipWrapperType \*type, int \*iserr)
- This function is deprecated from SIP v4.4. It is equivalent to::
-
- sipConvertToInstance(obj, type, NULL, SIP_NO_CONVERTORS, NULL, iserr);
-
-
sipConvertToInstance()
----------------------
@@ -4308,6 +4564,9 @@ void \*sipConvertToInstance(PyObject \*obj, sipWrapperType \*type, PyObject \*tr
that share the same error flag so that it only needs to be tested once
rather than after each call.)
+ This is deprecated from SIP v4.8. Instead you should use
+ `sipConvertToType()`_
+
sipConvertToMappedType()
------------------------
@@ -4336,6 +4595,41 @@ void \*sipConvertToMappedType(PyObject \*obj, const sipMappedType \*mt, PyObject
several calls to be made that share the same error flag so that it only
needs to be tested once rather than after each call.)
+ This is deprecated from SIP v4.8. Instead you should use
+ `sipConvertToType()`_
+
+
+sipConvertToType()
+------------------
+
+void \*sipConvertToType(PyObject \*obj, const sipTypeDef \*td, PyObject \*transferObj, int flags, int \*state, int \*iserr)
+ This converts a Python object to an instance of a C structure, C++ class or
+ mapped type assuming that a previous call to `sipCanConvertToType()`_ has
+ been successful. *obj* is the Python object. *td* is the generated type
+ structure corresponding to the C/C++ type returned. It may be any class in
+ the object's class hierarchy. *transferObj* controls any ownership changes
+ to *obj*. If it is ``NULL`` then the ownership is unchanged. If it is
+ ``Py_None`` then ownership is transferred to Python via a call to
+ `sipTransferBack()`_. Otherwise ownership is transferred to C/C++ and
+ *obj* associated with *transferObj* via a call to `sipTransferTo()`_.
+ *flags* is any combination of the following values used to fine tune the
+ check.
+
+ - ``SIP_NOT_NONE`` causes the check to fail if *obj* is ``None``.
+
+ - ``SIP_NO_CONVERTORS`` suppresses the use of of any
+ `%ConvertToTypeCode`_ for *td*. It is ignored for mapped types.
+
+ If *state* is not ``NULL`` then the location it points to is set to
+ describe the state of the returned C/C++ instance and is the value returned
+ by any `%ConvertToTypeCode`_. The calling code must then release the value
+ at some point to prevent a memory leak by calling `sipReleaseType()`_. If
+ there is an error then the location *iserr* points to is set to a non-zero
+ value. If it was initially a non-zero value then the conversion isn't
+ attempted in the first place. (This allows several calls to be made that
+ share the same error flag so that it only needs to be tested once rather
+ than after each call.)
+
sipConvertToVoidPtr()
---------------------
@@ -4347,33 +4641,6 @@ void \*sipConvertToVoidPtr(PyObject \*obj)
was successful.
-sipDisconnectRx()
------------------
-
-PyObject \*sipDisconnectRx(PyObject \*sender, const char \*signal, PyObject \*receiver, const char \*slot)
- This disconnects a signal from a signal or slot and returns ``Py_True`` if
- the signal was disconnected or ``Py_False`` if not. If there was some
- other error then a Python exception is raised and ``NULL`` is returned.
- *sender* is the wrapped ``QObject`` derived instance that emits the signal.
- *signal* is the typed name of the signal. *receiver* is the wrapped
- ``QObject`` derived instance or Python callable that the signal is
- connected to. *slot* is the typed name of the slot, or ``NULL`` if
- *receiver* is a Python callable. It is normally only used by PyQt to
- implement ``QObject.disconnect()``.
-
-
-sipEmitSignal()
----------------
-
-int sipEmitSignal(PyObject \*txobj, const char \*signal, PyObject \*args)
- This emits a signal and returns zero if there was no error. If there was
- an error then a Python exception is raised and a negative value is
- returned. *txobj* is the wrapped ``QObject`` derived instance that emits
- the signal. *signal* is the typed name of the signal. *args* is a Python
- tuple of the signal arguments. It is normally only used by PyQt to
- implement ``QObject.emit()``.
-
-
sipExportSymbol()
-----------------
@@ -4395,6 +4662,8 @@ sipWrapperType \*sipFindClass(const char \*type)
C/C++ type doesn't exist. The value of the pointer will not change and
may be saved in a static cache.
+ This is deprecated from SIP v4.8. Instead you should use `sipFindType()`_.
+
sipFindMappedType()
-------------------
@@ -4405,6 +4674,8 @@ const sipMappedType \*sipFindMappedType(const char \*type)
mapped type doesn't exist. The value of the pointer will not change and
may be saved in a static cache.
+ This is deprecated from SIP v4.8. Instead you should use `sipFindType()`_.
+
sipFindNamedEnum()
------------------
@@ -4415,6 +4686,18 @@ PyTypeObject \*sipFindNamedEnum(const char \*type)
if the named C/C++ enum doesn't exist. The value of the pointer will not
change and may be saved in a static cache.
+ This is deprecated from SIP v4.8. Instead you should use `sipFindType()`_.
+
+
+sipFindType()
+-------------
+
+const sipTypeDef \*sipFindType(const char \*type)
+ This returns a pointer to the SIP generated type structure corresponding to
+ a C/C++ type. *type* is the C/C++ declaration of the type. NULL is
+ returned if the type doesn't exist. The value of the pointer will not
+ change and may be saved in a static cache.
+
sipForceConvertToInstance()
---------------------------
@@ -4425,6 +4708,9 @@ void \*sipForceConvertToInstance(PyObject \*obj, sipWrapperType \*type, PyObject
`sipConvertToInstance()`_. See `sipConvertToInstance()`_ for a full
description of the arguments.
+ This is deprecated from SIP v4.8. Instead you should use
+ `sipForceConvertToType()`_.
+
sipForceConvertToMappedType()
-----------------------------
@@ -4436,6 +4722,19 @@ void \*sipForceConvertToMappedType(PyObject \*obj, const sipMappedType \*mt, PyO
`sipConvertToMappedType()`_. See `sipConvertToMappedType()`_ for a full
description of the arguments.
+ This is deprecated from SIP v4.8. Instead you should use
+ `sipForceConvertToType()`_.
+
+
+sipForceConvertToType()
+-----------------------
+
+void \*sipForceConvertToType(PyObject \*obj, const sipTypeDef \*td, PyObject \*transferObj, int flags, int \*state, int \*iserr)
+ This converts a Python object to an instance of a C structure, C++ class or
+ mapped type by calling `sipCanConvertToType()`_ and, if it is successfull,
+ calling `sipConvertToType()`_. See `sipConvertToType()`_ for a full
+ description of the arguments.
+
sipFree()
---------
@@ -4445,13 +4744,15 @@ void sipFree(void \*mem)
*mem* is a pointer to the area of memory.
-sipGetSender()
---------------
+sipGetPyObject()
+----------------
-const void \*sipGetSender()
- This returns a pointer to the last ``QObject`` instance that emitted a Qt
- signal. It is normally only used by PyQt to implement
- ``QObject.sender()``.
+PyObject \*sipGetPyObject(void \*cppptr, const sipTypeDef \*td)
+ This returns a borrowed reference to the Python object for a C structure or
+ C++ class instance. If the structure or class instance hasn't been wrapped
+ then ``NULL`` is returned (and no Python exception is raised). *cppptr* is
+ the pointer to the structure or class instance. *td* is the generated type
+ structure corresponding to the C/C++ type.
sipGetWrapper()
@@ -4464,6 +4765,9 @@ PyObject \*sipGetWrapper(void \*cppptr, sipWrapperType \*type)
raised). *cppptr* is the pointer to the structure or class instance.
*type* is the generated type corresponding to the C/C++ type.
+ This is deprecated from SIP v4.8. Instead you should use
+ `sipGetPyObject()`_.
+
sipImportSymbol()
-----------------
@@ -4490,14 +4794,7 @@ int typeInt
sipWrapperType \*\*pyType.
A pointer to the corresponding Python type object.
-
-sipIsSubClassInstance()
------------------------
-
-int sipIsSubClassInstance(PyObject \*obj, sipWrapperType \*type)
- This function is deprecated from SIP v4.4. It is equivalent to::
-
- sipCanConvertToInstance(obj, type, SIP_NOT_NONE | SIP_NO_CONVERTORS);
+This is deprecated from SIP v4.8.
sipLong_AsUnsignedLong()
@@ -4529,6 +4826,8 @@ sipWrapperType \*sipMapIntToClass(int type, const sipIntTypeClassMap \*map, int
the table. The corresponding Python type object is returned, or ``NULL``
if *type* wasn't in *map*.
+ This is deprecated from SIP v4.8.
+
sipMapStringToClass()
---------------------
@@ -4542,6 +4841,8 @@ sipWrapperType \*sipMapStringToClass(char \*type, const sipStringTypeClassMap \*
is the number of entries in the table. The corresponding Python type
object is returned, or ``NULL`` if *type* wasn't in *map*.
+ This is deprecated from SIP v4.8.
+
sipParseResult()
----------------
@@ -4568,11 +4869,6 @@ int sipParseResult(int \*iserr, PyObject \*method, PyObject \*result, const char
will convert, and the entry in brackets are the types of the C/C++ values
to be passed.
- ``a`` (string) [const char \*\*, int \*]
- Convert a Python string to a C/C++ character array and its length. If
- the Python object is ``Py_None`` then the array and length are ``NULL``
- and zero respectively. This is deprecated, use ``g`` instead.
-
``b`` (integer) [bool \*]
Convert a Python integer to a C/C++ ``bool``.
@@ -4629,12 +4925,6 @@ int sipParseResult(int \*iserr, PyObject \*method, PyObject \*result, const char
character string. If the Python object is ``Py_None`` then the string
is ``NULL``.
- ``A`` (unicode) [wchar_t \*\*, int \*]
- Convert a Python unicode object to a C/C++ wide character array and its
- length. If the Python object is ``Py_None`` then the array and length
- are ``NULL`` and zero respectively. This is deprecated, use ``G``
- instead.
-
``Cf`` (wrapped class) [sipWrapperType \*, int \*, void \*\*]
Convert a Python object to a C structure or a C++ class instance and
return its state as described in `sipConvertToInstance()`_. ``f`` is a
@@ -4649,12 +4939,13 @@ int sipParseResult(int \*iserr, PyObject \*method, PyObject \*result, const char
instance. Note that the ``int *`` used to return the state is
not passed if this flag is specified.
- ``Df`` (mapped type) [const sipMappedType \*, int \*, void \*\*]
- Convert a Python object to a C structure or a C++ class instance
- implemented as a mapped type and return its state as described in
- `sipConvertToMappedType()`_. ``f`` is a combination of the following
- flags encoded as an ASCII character by adding ``0`` to the combined
- value:
+ This is deprecated from SIP v4.8. Instead you should use ``Df``.
+
+ ``Df`` (wrapped instance) [const sipTypeDef \*, int \*, void \*\*]
+ Convert a Python object to a C structure, C++ class or mapped type
+ instance and return its state as described in `sipConvertToType()`_.
+ ``f`` is a combination of the following flags encoded as an ASCII
+ character by adding ``0`` to the combined value:
0x01 disallows the conversion of ``Py_None`` to ``NULL``
@@ -4667,22 +4958,16 @@ int sipParseResult(int \*iserr, PyObject \*method, PyObject \*result, const char
``E`` (wrapped enum) [PyTypeObject \*, enum \*]
Convert a Python named enum type to the corresponding C/C++ ``enum``.
+ This is deprecated from SIP v4.8. Instead you should use ``F``.
+
+ ``F`` (wrapped enum) [sipTypeDef \*, enum \*]
+ Convert a Python named enum type to the corresponding C/C++ ``enum``.
+
``G`` (unicode) [wchar_t \*\*, SIP_SSIZE_T \*]
Convert a Python unicode object to a C/C++ wide character array and its
length. If the Python object is ``Py_None`` then the array and length
are ``NULL`` and zero respectively.
- ``L`` (object) [*type* \*(\*)(PyObject \*obj, int \*iserr), void \*\*]
- Convert a Python object to a C structure or a C++ class instance using
- a convertor function. See `Generated Type Convertors`_. This is
- deprecated from SIP v4.4.
-
- ``M`` (object) [*type* \*(\*)(PyObject \*obj, int \*iserr), void \*\*]
- Convert a Python object to a C structure or a C++ class instance using
- a convertor function. If the structure or class instance pointer is
- ``NULL`` then return an error. See `Generated Type Convertors`_. This
- is deprecated from SIP v4.4.
-
``N`` (object) [PyTypeObject \*, PyObject \*\*]
A Python object is checked to see if it is a certain type and then
returned without any conversions. The reference count is incremented.
@@ -4704,6 +4989,44 @@ int sipParseResult(int \*iserr, PyObject \*method, PyObject \*result, const char
Check that a Python object is ``Py_None``. No value is returned.
+sipRegisterAttributeGetter()
+----------------------------
+
+int sipRegisterAttributeGetter(const sipTypeDef \*td, sipAttrGetterFunc getter)
+ This registers a handler that will called just before SIP needs to get an
+ attribute from a wrapped type's dictionary for the first time. The handler
+ must then populate the type's dictionary with any lazy attributes. -1 is
+ returned if there was an error registering the handler, 0 is returned
+ otherwise.
+
+ *td* is an optional generated type definition which means that the handler
+ will only be called for types with that type or sub-classed from it. If it
+ is ``NULL`` then the handler will be called for all types.
+
+ *getter* is the handler and it has the following signature.
+
+ int handler(const sipTypeDef \*td, PyObject \*dict)
+ *td* is the generated type definition of the type whose dictionary is
+ to be populated.
+
+ *dict* is the dictionary to be populated.
+
+ -1 is returned if there is an error, 0 is returned otherwise.
+
+ See the section `Lazy Type Attributes`_ for more details.
+
+
+sipRegisterPyType()
+-------------------
+
+int sipRegisterPyType(PyTypeObject \*type)
+ This registers a type object that can be used as the meta-type or
+ super-type of a wrapped C++ type. *type* is the type. -1 is returned if
+ there was an error registering the type, 0 is returned otherwise.
+
+ See the section `Types and Meta-types`_ for more details.
+
+
sipReleaseInstance()
--------------------
@@ -4714,6 +5037,9 @@ void sipReleaseInstance(void \*cpp, sipWrapperType \*type, int state)
*type* is the generated type corresponding to *cpp*. *state* describes the
state of the instance.
+ This is deprecated from SIP v4.8. Instead you should use
+ `sipReleaseType()`_.
+
sipReleaseMappedType()
----------------------
@@ -4725,6 +5051,47 @@ void sipReleaseMappedType(void \*cpp, const sipMappedType \*mt, int state)
*mt* is the opaque structure returned by `sipFindMappedType()`_. *state*
describes the state of the instance.
+ This is deprecated from SIP v4.8. Instead you should use
+ `sipReleaseType()`_.
+
+
+sipReleaseType()
+----------------
+
+void sipReleaseType(void \*cpp, const sipTypeDef \*td, int state)
+ This destroys a wrapped C/C++ or mapped type instance if it was a temporary
+ instance. It is called after a call to either `sipConvertToType()`_ or
+ `sipForceConvertToType()`_. *cpp* is the wrapped C/C++ instance. *td* is
+ the generated type structure. *state* describes the state of the instance.
+
+
+sipResolveTypedef()
+-------------------
+
+const char \*sipResolveTypedef(const char \*name)
+ If *name* refers to a C/C++ typedef then the value of that typedef is
+ returned, otherwise ``NULL`` is returned.
+
+
+sipSimpleWrapper
+----------------
+
+This is a C structure that represents a Python wrapped instance whose type is
+``sip.simplewrapper``. It is an extension of the ``PyObject`` structure and so
+may be safely cast to it.
+
+It includes a member called ``user`` which is of type ``PyObject *``. This can
+be used for any purpose by handwritten code and will automatically be garbage
+collected at the appropriate time.
+
+
+sipSimpleWrapper_Type
+---------------------
+
+This is a pointer to a ``PyTypeObject`` structure that is the type of a
+`sipSimpleWrapper`_ structure and is the C implementation of
+``sip.simplewrapper``. It may be safely cast to `sipWrapperType`_.
+
sipStringTypeClassMap
---------------------
@@ -4739,19 +5106,7 @@ char \*typeString
sipWrapperType \*\*pyType.
A pointer to the corresponding Python type object.
-
-sipTransfer()
--------------
-
-void sipTransfer(PyObject \*obj, int tocpp)
- This function is deprecated from SIP v4.3. If *tocpp* is non-zero then the
- equivalent call is::
-
- sipTransferTo(obj, obj);
-
- If *tocpp* is zero then the equivalent call is::
-
- sipTransferBack(obj);
+This is deprecated from SIP v4.8.
sipTransferBack()
@@ -4787,14 +5142,93 @@ void sipTransferTo(PyObject \*obj, PyObject \*owner)
destructor is always transfered to C++.
+sipTypeAsPyTypeObject()
+-----------------------
+
+PyTypeObject \*sipTypeAsPyTypeObject(sipTypeDef \*td)
+ This returns a pointer to the Python type object that SIP creates from a
+ generated type structure. *td* is the type structure.
+
+ If the type structure refers to a C structure or C++ class then it may be
+ safely cast to a `sipWrapperType`_.
+
+ If the type structure refers to a mapped type then ``NULL`` will be
+ returned.
+
+
+sipTypeFromPyTypeObject()
+-------------------------
+
+const sipTypeDef \*sipTypeFromPyTypeObject(PyTypeObject \*py_type)
+ This returns a pointer to the SIP generated type structure for a Python
+ type. *py_type* is the Python type object.
+
+ If the Python type doesn't correspond to a SIP generated type then ``NULL``
+ will be returned.
+
+
+sipTypeIsClass()
+----------------
+
+int sipTypeIsClass(sipTypeDef \*td)
+ This returns a non-zero value if the generated type structure refers to a
+ C structure or C++ class. *td* is the type structure.
+
+
+sipTypeIsEnum()
+---------------
+
+int sipTypeIsEnum(sipTypeDef \*td)
+ This returns a non-zero value if the generated type structure refers to a
+ named enum. *td* is the type structure.
+
+
+sipTypeIsMapped()
+-----------------
+
+int sipTypeIsMapped(sipTypeDef \*td)
+ This returns a non-zero value if the generated type structure refers to a
+ mapped type. *td* is the type structure.
+
+
+sipTypeIsNamespace()
+--------------------
+
+int sipTypeIsNamespace(sipTypeDef \*td)
+ This returns a non-zero value if the generated type structure refers to a
+ C++ namespace. *td* is the type structure.
+
+
+sipTypeName()
+-------------
+
+const char \*sipTypeName(const sipTypeDef \*td)
+ This returns the C/C++ name of a SIP generated type. *td* is the type
+ structure.
+
+
+sipTypeScope()
+--------------
+
+const sipTypeDef \*sipTypeScope(const sipTypeDef \*td)
+ This returns the SIP generated type structure of the scope of another
+ SIP generated type structure. ``NULL`` will be returned if the type has no
+ scope.
+
+
+sipVoidPtr_Type
+---------------
+
+This is a pointer to a ``PyTypeObject`` structure that is the type of a
+``PyObject`` structure that is used to wrap a ``void *``.
+
+
sipWrapper
----------
-This is a C structure that represents a Python wrapped instance. It is an
-extension of the Python ``PyObject`` structure and so may be safely cast to
-``PyObject``. It includes a member called ``user`` which is of type
-``PyObject *``. This can be used for any purpose by handwritten code and will
-automatically be garbage collected at the appropriate time.
+This is a C structure that represents a Python wrapped instance whose type is
+``sip.wrapper``. It is an extension of the `sipSimpleWrapper`_ and
+``PyObject`` structures and so may be safely cast to both.
sipWrapper_Check()
@@ -4804,57 +5238,70 @@ int sipWrapper_Check(PyObject \*obj)
This returns a non-zero value if a Python object is a wrapped instance.
*obj* is the Python object.
+ This is deprecated from SIP v4.8. Instead you should use the following::
+
+ PyObject_TypeCheck(obj, sipWrapper_Type)
+
+
+sipWrapper_Type
+---------------
+
+This is a pointer to a ``PyTypeObject`` structure that is the type of a
+`sipWrapper`_ structure and is the C implementation of ``sip.wrapper``. It may
+be safely cast to `sipWrapperType`_.
+
sipWrapperType
--------------
This is a C structure that represents a SIP generated type object. It is an
-extension of the Python ``PyTypeObject`` structure (which is itself an
-extension of the Python ``PyObject`` structure) and so may be safely cast to
-``PyTypeObject`` (and ``PyObject``).
+extension of the ``PyTypeObject`` structure (which is itself an extension of
+the ``PyObject`` structure) and so may be safely cast to ``PyTypeObject`` (and
+``PyObject``).
-Generated Type Convertors
--------------------------
+sipWrapperType_Type
+-------------------
+
+This is a pointer to a ``PyTypeObject`` structure that is the type of a
+`sipWrapperType`_ structure and is the C implementation of ``sip.wrappertype``.
-These functions are deprecated from SIP v4.4.
-SIP generates functions for all types being wrapped (including mapped types
-defined with the `%MappedType`_ directive) that convert a Python object to the
-C structure or C++ class instance. The name of this convertor is the name of
-the structure or class prefixed by ``sipForceConvertTo_``.
+Generated Type Structures
+-------------------------
-void \*sipForceConvertTo_*class*(PyObject \*obj, int \*iserr)
- *obj* is the Python object to convert. If *obj* is ``NULL`` or the
- location pointed to by *iserr* is non-zero then the conversion is not
- attempted and ``NULL`` is returned. If there was an error then the
- location pointed to by *iserr* is set to a non-zero value, a Python
- exception is raised, and ``NULL`` is returned.
+SIP generates an opaque type structure for each C structure, C++ class, C++
+namespace, named enum or mapped type being wrapped. These are ``sipTypeDef``
+structures and are used extensively by the SIP API.
-SIP also generates functions for mapped types that convert a C structure or
-C++ class instance to a Python object. The name of this convertor is the name
-of the structure or class prefixed by ``sipConvertFrom_``.
+The names of these structure are prefixed by ``sipType_``.
-PyObject \*sipConvertFrom_*class*(void \*cppptr)
- *cppptr* is a pointer to the C structure or C++ class instance to convert.
- If there was an error then ``NULL`` is returned and a Python exception
- raised.
+For those structures that correspond to C structures, C++ classes, C++
+namespaces or named enums the remaining part of the name is the fully
+qualified name of the structure, class, namespace or enum name. Any ``::``
+scope separators are replaced by an underscore. For example, the type object
+for class ``Klass`` is ``sipType_Klass``.
-The convertor functions of all imported types are available to handwritten
-code.
+For those structure that correspond to mapped types the remaining part of the
+name is generated by SIP. The only way for handwritten code to obtain a
+pointer to a structure for a mapped type is to use `sipFindType()`_.
+
+The type structures of all imported types are available to handwritten code.
Generated Type Objects
----------------------
-SIP generates a type object for each C structure or C++ class being wrapped.
-These are sipWrapperType_ structures and are used extensively by the SIP API.
+SIP generates a sipWrapperType_ type object for each C structure or C++ class
+being wrapped.
These objects are named with the structure or class name prefixed by
``sipClass_``. For example, the type object for class ``Klass`` is
``sipClass_Klass``.
-The type objects of all imported classes are available to handwritten code.
+Using these names is deprecated from SIP v4.8. Instead use the corresponding
+generated type structure (see `Generated Type Structures`_) and
+`sipTypeAsPyTypeObject()`_.
Generated Named Enum Type Objects
@@ -4867,7 +5314,9 @@ These objects are named with the fully qualified enum name (i.e. including any
enclosing scope) prefixed by ``sipEnum_``. For example, the type object for
enum ``Enum`` defined in class ``Klass`` is ``sipEnum_Klass_Enum``.
-The type objects of all imported named enums are available to handwritten code.
+Using these names is deprecated from SIP v4.8. Instead use the corresponding
+generated type structure (see `Generated Type Structures`_) and
+`sipTypeAsPyTypeObject()`_.
Generated Derived Classes
@@ -4925,11 +5374,10 @@ name to lower case and preceding it with an underscore. For example:
``sipWrapperCheck`` becomes ``api_wrapper_check``
Note that the type objects that SIP generates for a wrapped module (see
-`Generated Type Objects`_, `Generated Named Enum Type Objects`_ and
+`Generated Type Structures`_, `Generated Named Enum Type Objects`_ and
`Generated Exception Objects`_) cannot be refered to directly and must be
-obtained using the `sipFindClass()`_, `sipFindMappedType()`_ and
-`sipFindNamedEnum()`_ functions. Of course, the corresponding modules must
-already have been imported into the interpreter.
+obtained using the `sipFindType()`_ function. Of course, the corresponding
+modules must already have been imported into the interpreter.
The following code fragment shows how to get a pointer to the ``sipAPIDef``
data structure::
@@ -5027,16 +5475,6 @@ SIP_VERSION_STR
represented as a string. For development snapshots it will start with
``snapshot-``. It was first implemented in SIP v4.3.
-transfer(obj, direction)
- This function is deprecated from SIP v4.3. If *direction* is non-zero then
- the equivalent call is::
-
- sip.transferto(obj, None)
-
- If *direction* is zero then the equivalent call is::
-
- sip.transferback(obj)
-
transferback(obj)
This function is a wrapper around `sipTransferBack()`_.
doc/sipref.txt
@@ -1,7 +1,7 @@
/*
* The XML and API file generator module for SIP.
*
- * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
+ * Copyright (c) 2009 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -47,6 +47,7 @@ static void xmlIndent(int indent, FILE *fp);
static const char *dirAttribute(argDef *ad);
static void exportDefaultValue(argDef *ad, FILE *fp);
static const char *pyType(argDef *ad, int sec, classDef **scope);
+static void prScopedPythonName(FILE *fp, classDef *scope, const char *pyname);
/*
@@ -126,7 +127,7 @@ static int apiCtor(moduleDef *mod, classDef *scope, ctorDef *ct, int sec,
/* Do the callable type form. */
fprintf(fp, "%s.", mod->name);
- prScopedPythonName(fp, scope->ecd, scope->pyname);
+ prScopedPythonName(fp, scope->ecd, scope->pyname->text);
fprintf(fp, "(");
need_comma = FALSE;
@@ -145,7 +146,7 @@ static int apiCtor(moduleDef *mod, classDef *scope, ctorDef *ct, int sec,
/* Do the call __init__ form. */
fprintf(fp, "%s.", mod->name);
- prScopedPythonName(fp, scope->ecd, scope->pyname);
+ prScopedPythonName(fp, scope->ecd, scope->pyname->text);
fprintf(fp, ".__init__(self");
for (a = 0; a < ct->pysig.nrArgs; ++a)
@@ -379,7 +380,7 @@ static void xmlClass(sipSpec *pt, moduleDef *mod, classDef *cd, FILE *fp)
{
xmlIndent(indent, fp);
fprintf(fp, "<OpaqueClass name=\"");
- prScopedPythonName(fp, cd->ecd, cd->pyname);
+ prScopedPythonName(fp, cd->ecd, cd->pyname->text);
fprintf(fp, "\"/>\n");
return;
@@ -387,7 +388,7 @@ static void xmlClass(sipSpec *pt, moduleDef *mod, classDef *cd, FILE *fp)
xmlIndent(indent++, fp);
fprintf(fp, "<Class name=\"");
- prScopedPythonName(fp, cd->ecd, cd->pyname);
+ prScopedPythonName(fp, cd->ecd, cd->pyname->text);
fprintf(fp, "\"");
if (cd->picklecode != NULL)
@@ -410,7 +411,7 @@ static void xmlClass(sipSpec *pt, moduleDef *mod, classDef *cd, FILE *fp)
if (cl != cd->supers)
fprintf(fp, " ");
- prScopedPythonName(fp, cl->cd->ecd, cl->cd->pyname);
+ prScopedPythonName(fp, cl->cd->ecd, cl->cd->pyname->text);
}
fprintf(fp, "\"");
@@ -570,6 +571,7 @@ static void xmlFunction(classDef *scope, memberDef *md, overDef *oloads,
int indent, FILE *fp)
{
overDef *od;
+ const char *default_str = "default=\"1\" ";
for (od = oloads; od != NULL; od = od->next)
{
@@ -585,12 +587,14 @@ static void xmlFunction(classDef *scope, memberDef *md, overDef *oloads,
if (isSignal(od))
{
xmlIndent(indent, fp);
- fprintf(fp, "<Signal name=\"");
+ fprintf(fp, "<Signal %sname=\"", default_str);
prScopedPythonName(fp, scope, md->pyname->text);
fprintf(fp, "\" sig=\"");
xmlCppSignature(fp, od);
fprintf(fp, "\"/>\n");
+ default_str = "";
+
continue;
}
@@ -638,7 +642,7 @@ static int xmlOverload(classDef *scope, memberDef *md, overDef *od,
if (xtnds != NULL)
{
fprintf(fp, " extends=\"");
- prScopedPythonName(fp, xtnds->ecd, xtnds->pyname);
+ prScopedPythonName(fp, xtnds->ecd, xtnds->pyname->text);
fprintf(fp, "\"");
}
@@ -868,7 +872,7 @@ static const char *pyType(argDef *ad, int sec, classDef **scope)
switch (ad->atype)
{
case class_type:
- type_name = ad->u.cd->pyname;
+ type_name = ad->u.cd->pyname->text;
*scope = ad->u.cd->ecd;
break;
@@ -992,3 +996,19 @@ static const char *pyType(argDef *ad, int sec, classDef **scope)
return type_name;
}
+
+
+/*
+ * Generate a scoped Python name.
+ */
+static void prScopedPythonName(FILE *fp, classDef *scope, const char *pyname)
+{
+ if (scope != NULL)
+ {
+ prScopedPythonName(fp, scope->ecd, NULL);
+ fprintf(fp, "%s.", scope->pyname->text);
+ }
+
+ if (pyname != NULL)
+ fprintf(fp, "%s", pyname);
+}
sipgen/export.c
@@ -1,7 +1,7 @@
/*
* The code generator module for SIP.
*
- * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
+ * Copyright (c) 2009 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -23,12 +23,11 @@
#include "sip.h"
-/*
- * These must match the values of SIP_TYPE_FLAGS_SHIFT and SIP_TYPE_FLAGS_MASK
- * in siplib/sip.h.
- */
-#define TYPE_FLAGS_SHIFT 8
-#define TYPE_FLAGS_MASK 0x0f00
+/* Return the base (ie. C/C++) name of a super-type or meta-type. */
+#define smtypeName(sm) (strrchr((sm)->name->text, '.') + 1)
+
+/* Return TRUE if a wrapped variable can be set. */
+#define canSetVariable(vd) ((vd)->type.nrderefs != 0 || !isConstArg(&(vd)->type))
/* Control what generateCalledArgs() actually generates. */
@@ -79,11 +78,10 @@ static void generateIfaceCpp(sipSpec *, ifaceFileDef *, const char *,
static void generateMappedTypeCpp(mappedTypeDef *mtd, sipSpec *pt, FILE *fp);
static void generateImportedMappedTypeAPI(mappedTypeDef *mtd, moduleDef *mod,
FILE *fp);
-static void generateMappedTypeAPI(mappedTypeDef *mtd, FILE *fp);
+static void generateMappedTypeAPI(sipSpec *pt, mappedTypeDef *mtd, FILE *fp);
static void generateClassCpp(classDef *cd, sipSpec *pt, FILE *fp);
static void generateImportedClassAPI(classDef *cd, sipSpec *pt, moduleDef *mod,
FILE *fp);
-static void generateClassTableEntries(moduleDef *mod, nodeDef *nd, FILE *fp);
static void generateClassAPI(classDef *cd, sipSpec *pt, FILE *fp);
static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd,
FILE *fp);
@@ -110,7 +108,7 @@ static void generateCalledArgs(classDef *, signatureDef *, funcArgType, int,
FILE *);
static void generateVariable(classDef *, argDef *, int, FILE *);
static void generateNamedValueType(classDef *, argDef *, char *, FILE *);
-static void generateBaseType(classDef *, argDef *, FILE *);
+static void generateBaseType(classDef *, argDef *, int, FILE *);
static void generateNamedBaseType(classDef *, argDef *, char *, int, FILE *);
static void generateTupleBuilder(signatureDef *, FILE *);
static void generateEmitters(classDef *cd, FILE *fp);
@@ -139,9 +137,9 @@ static void generateComparisonSlotCall(classDef *cd, overDef *od,
static void generateBinarySlotCall(classDef *cd, overDef *od, const char *op,
int deref, FILE *fp);
static void generateNumberSlotCall(overDef *od, char *op, FILE *fp);
-static void generateVariableHandler(classDef *, varDef *, FILE *);
+static void generateVariableGetter(classDef *, varDef *, FILE *);
+static void generateVariableSetter(classDef *, varDef *, FILE *);
static int generateObjToCppConversion(argDef *, FILE *);
-static void generateVarClassConversion(varDef *, int, FILE *);
static void generateVarMember(varDef *vd, FILE *fp);
static int generateVoidPointers(sipSpec *pt, moduleDef *mod, classDef *cd,
FILE *fp);
@@ -166,10 +164,8 @@ static int generateVariableType(sipSpec *pt, moduleDef *mod, classDef *cd,
argType atype, const char *eng, const char *s1, const char *s2,
FILE *fp);
static int generateDoubles(sipSpec *pt, moduleDef *mod, classDef *cd, FILE *fp);
-static int generateEnums(sipSpec *pt, moduleDef *mod, classDef *cd, FILE *fp);
static int generateClasses(sipSpec *pt, moduleDef *mod, classDef *cd, FILE *fp);
-static void generateEnumsInline(sipSpec *pt, moduleDef *mod, FILE *fp);
-static void generateClassesInline(sipSpec *pt, moduleDef *mod, FILE *fp);
+static void generateTypesInline(sipSpec *pt, moduleDef *mod, FILE *fp);
static void generateAccessFunctions(sipSpec *pt, moduleDef *mod, classDef *cd,
FILE *fp);
static void generateConvertToDefinitions(mappedTypeDef *, classDef *, FILE *);
@@ -226,6 +222,8 @@ static void generateMappedTypeFromVoid(mappedTypeDef *mtd, const char *cname,
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);
/*
@@ -453,7 +451,7 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
, mname
, mname);
- if (optRegisterTypes(pt))
+ if (pluginPyQt4(pt))
prcode(fp,
"\n"
"#include <QMetaType>\n"
@@ -483,12 +481,12 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
"#define SIP_FEATURE_%s\n"
, qd->name);
}
+ }
- if (!noIntro)
- prcode(fp,
+ if (!noIntro)
+ prcode(fp,
"\n"
- );
- }
+ );
generateCppCodeBlock(pt->exphdrcode, fp);
generateCppCodeBlock(mod->hdrcode, fp);
@@ -498,7 +496,7 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
for (nd = pt->namecache; nd != NULL; nd = nd->next)
{
- if (!isClassName(nd))
+ if (!isUsedName(nd))
continue;
if (noIntro)
@@ -506,8 +504,8 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
prcode(fp,
"\n"
"/*\n"
-" * Convenient names to refer to the names of classes defined in this module.\n"
-" * These are part of the public API.\n"
+" * Convenient names to refer to various strings defined in this module.\n"
+" * Only the class names are part of the public API.\n"
" */\n"
);
@@ -515,18 +513,14 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
}
prcode(fp,
-"#define sipName_%s %N\n"
- , nd->text, nd);
+"#define %n %d\n"
+"#define %N &sipStrings_%s[%d]\n"
+ , nd, (int)nd->offset
+ , nd, mname, (int)nd->offset);
}
prcode(fp,
"\n"
-"/* Convenient names to call the SIP API. */\n"
-"#define sipConvertFromSliceObject(o,len,start,stop,step,slen) PySlice_GetIndicesEx((PySliceObject *)(o),(len),(start),(stop),(step),(slen))\n"
-"#define sipIsSubClassInstance(o,wt) PyObject_TypeCheck((o),(PyTypeObject *)(wt))\n"
-"\n"
-"#define sipMapStringToClass sipAPI_%s->api_map_string_to_class\n"
-"#define sipMapIntToClass sipAPI_%s->api_map_int_to_class\n"
"#define sipMalloc sipAPI_%s->api_malloc\n"
"#define sipFree sipAPI_%s->api_free\n"
"#define sipBuildResult sipAPI_%s->api_build_result\n"
@@ -538,7 +532,6 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
"#define sipCommonDtor sipAPI_%s->api_common_dtor\n"
"#define sipConvertFromSequenceIndex sipAPI_%s->api_convert_from_sequence_index\n"
"#define sipConvertFromVoidPtr sipAPI_%s->api_convert_from_void_ptr\n"
-"#define sipConvertToCpp sipAPI_%s->api_convert_to_cpp\n"
"#define sipConvertToVoidPtr sipAPI_%s->api_convert_to_void_ptr\n"
"#define sipNoFunction sipAPI_%s->api_no_function\n"
"#define sipNoMethod sipAPI_%s->api_no_method\n"
@@ -548,57 +541,44 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
"#define sipBadCatcherResult sipAPI_%s->api_bad_catcher_result\n"
"#define sipBadOperatorArg sipAPI_%s->api_bad_operator_arg\n"
"#define sipTrace sipAPI_%s->api_trace\n"
-"#define sipTransfer sipAPI_%s->api_transfer\n"
"#define sipTransferBack sipAPI_%s->api_transfer_back\n"
"#define sipTransferTo sipAPI_%s->api_transfer_to\n"
"#define sipTransferBreak sipAPI_%s->api_transfer_break\n"
-"#define sipWrapper_Check sipAPI_%s->api_wrapper_check\n"
-"#define sipGetWrapper sipAPI_%s->api_get_wrapper\n"
+"#define sipSimpleWrapper_Type sipAPI_%s->api_simplewrapper_type\n"
+"#define sipWrapper_Type sipAPI_%s->api_wrapper_type\n"
+"#define sipWrapperType_Type sipAPI_%s->api_wrappertype_type\n"
+"#define sipVoidPtr_Type sipAPI_%s->api_voidptr_type\n"
+"#define sipGetPyObject sipAPI_%s->api_get_pyobject\n"
"#define sipGetCppPtr sipAPI_%s->api_get_cpp_ptr\n"
"#define sipGetComplexCppPtr sipAPI_%s->api_get_complex_cpp_ptr\n"
"#define sipIsPyMethod sipAPI_%s->api_is_py_method\n"
"#define sipCallHook sipAPI_%s->api_call_hook\n"
"#define sipStartThread sipAPI_%s->api_start_thread\n"
"#define sipEndThread sipAPI_%s->api_end_thread\n"
-"#define sipEmitSignal sipAPI_%s->api_emit_signal\n"
"#define sipConnectRx sipAPI_%s->api_connect_rx\n"
"#define sipDisconnectRx sipAPI_%s->api_disconnect_rx\n"
-"#define sipGetSender sipAPI_%s->api_get_sender\n"
"#define sipRaiseUnknownException sipAPI_%s->api_raise_unknown_exception\n"
-"#define sipRaiseClassException sipAPI_%s->api_raise_class_exception\n"
-"#define sipRaiseSubClassException sipAPI_%s->api_raise_sub_class_exception\n"
+"#define sipRaiseTypeException sipAPI_%s->api_raise_type_exception\n"
"#define sipBadLengthForSlice sipAPI_%s->api_bad_length_for_slice\n"
-"#define sipClassName sipAPI_%s->api_class_name\n"
-"#define sipAddClassInstance sipAPI_%s->api_add_class_instance\n"
-"#define sipAddMappedTypeInstance sipAPI_%s->api_add_mapped_type_instance\n"
-"#define sipAddEnumInstance sipAPI_%s->api_add_enum_instance\n"
-"#define sipConvertFromNamedEnum sipAPI_%s->api_convert_from_named_enum\n"
+"#define sipAddTypeInstance sipAPI_%s->api_add_type_instance\n"
"#define sipGetAddress sipAPI_%s->api_get_address\n"
-"#define sipFreeConnection sipAPI_%s->api_free_connection\n"
-"#define sipEmitToSlot sipAPI_%s->api_emit_to_slot\n"
-"#define sipSameConnection sipAPI_%s->api_same_connection\n"
+"#define sipFreeSipslot sipAPI_%s->api_free_sipslot\n"
+"#define sipSameSlot sipAPI_%s->api_same_slot\n"
"#define sipPySlotExtend sipAPI_%s->api_pyslot_extend\n"
"#define sipConvertRx sipAPI_%s->api_convert_rx\n"
"#define sipAddDelayedDtor sipAPI_%s->api_add_delayed_dtor\n"
-"#define sipCanConvertToInstance sipAPI_%s->api_can_convert_to_instance\n"
-"#define sipCanConvertToMappedType sipAPI_%s->api_can_convert_to_mapped_type\n"
-"#define sipConvertToInstance sipAPI_%s->api_convert_to_instance\n"
-"#define sipConvertToMappedType sipAPI_%s->api_convert_to_mapped_type\n"
-"#define sipForceConvertToInstance sipAPI_%s->api_force_convert_to_instance\n"
-"#define sipForceConvertToMappedType sipAPI_%s->api_force_convert_to_mapped_type\n"
-"#define sipReleaseInstance sipAPI_%s->api_release_instance\n"
-"#define sipReleaseMappedType sipAPI_%s->api_release_mapped_type\n"
-"#define sipConvertFromInstance sipAPI_%s->api_convert_from_instance\n"
-"#define sipConvertFromNewInstance sipAPI_%s->api_convert_from_new_instance\n"
-"#define sipConvertFromMappedType sipAPI_%s->api_convert_from_mapped_type\n"
+"#define sipCanConvertToType sipAPI_%s->api_can_convert_to_type\n"
+"#define sipConvertToType sipAPI_%s->api_convert_to_type\n"
+"#define sipForceConvertToType sipAPI_%s->api_force_convert_to_type\n"
+"#define sipReleaseType sipAPI_%s->api_release_type\n"
+"#define sipConvertFromType sipAPI_%s->api_convert_from_type\n"
+"#define sipConvertFromNewType sipAPI_%s->api_convert_from_new_type\n"
+"#define sipConvertFromEnum sipAPI_%s->api_convert_from_enum\n"
"#define sipGetState sipAPI_%s->api_get_state\n"
-"#define sipFindMappedType sipAPI_%s->api_find_mapped_type\n"
"#define sipLong_AsUnsignedLong sipAPI_%s->api_long_as_unsigned_long\n"
"#define sipExportSymbol sipAPI_%s->api_export_symbol\n"
"#define sipImportSymbol sipAPI_%s->api_import_symbol\n"
-"#define sipRegisterIntTypes sipAPI_%s->api_register_int_types\n"
-"#define sipParseSignature sipAPI_%s->api_parse_signature\n"
-"#define sipFindClass sipAPI_%s->api_find_class\n"
+"#define sipFindType sipAPI_%s->api_find_type\n"
"#define sipFindNamedEnum sipAPI_%s->api_find_named_enum\n"
"#define sipString_AsChar sipAPI_%s->api_string_as_char\n"
"#define sipUnicode_AsWChar sipAPI_%s->api_unicode_as_wchar\n"
@@ -607,20 +587,36 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
"#define sipConvertFromVoidPtrAndSize sipAPI_%s->api_convert_from_void_ptr_and_size\n"
"#define sipConvertFromConstVoidPtrAndSize sipAPI_%s->api_convert_from_const_void_ptr_and_size\n"
"#define sipInvokeSlot sipAPI_%s->api_invoke_slot\n"
-"#define sipParseType sipAPI_%s->api_parse_type\n"
-"#define sipIsExactWrappedType sipAPI_%s->api_is_exact_wrapped_type\n"
-"#define sipAssignInstance sipAPI_%s->api_assign_instance\n"
-"#define sipAssignMappedType sipAPI_%s->api_assign_mapped_type\n"
-"#define sipRegisterMetaType sipAPI_%s->api_register_meta_type\n"
+"#define sipSaveSlot sipAPI_%s->api_save_slot\n"
+"#define sipClearAnySlotReference sipAPI_%s->api_clear_any_slot_reference\n"
+"#define sipVisitSlot sipAPI_%s->api_visit_slot\n"
"#define sipWrappedTypeName(wt) ((wt)->type->td_cname)\n"
"#define sipDeprecated sipAPI_%s->api_deprecated\n"
- ,mname
- ,mname
- ,mname
- ,mname
- ,mname
- ,mname
- ,mname
+"#define sipRegisterPyType sipAPI_%s->api_register_py_type\n"
+"#define sipTypeFromPyTypeObject sipAPI_%s->api_type_from_py_type_object\n"
+"#define sipTypeScope sipAPI_%s->api_type_scope\n"
+"#define sipResolveTypedef(n) sipAPI_%s->api_resolve_typedef((n), &sipModuleAPI_%s)\n"
+"#define sipRegisterAttributeGetter sipAPI_%s->api_register_attribute_getter\n"
+"\n"
+"/* These are deprecated. */\n"
+"#define sipMapStringToClass sipAPI_%s->api_map_string_to_class\n"
+"#define sipMapIntToClass sipAPI_%s->api_map_int_to_class\n"
+"#define sipFindClass sipAPI_%s->api_find_class\n"
+"#define sipFindMappedType sipAPI_%s->api_find_mapped_type\n"
+"#define sipWrapper_Check(w) PyObject_TypeCheck((w), sipAPI_%s->api_wrapper_type)\n"
+"#define sipGetWrapper(p, wt) sipGetPyObject((p), (wt)->type)\n"
+"#define sipReleaseInstance(p, wt, s) sipReleaseType((p), (wt)->type, (s))\n"
+"#define sipReleaseMappedType sipReleaseType\n"
+"#define sipCanConvertToInstance(o, wt, f) sipCanConvertToType((o), (wt)->type, (f))\n"
+"#define sipCanConvertToMappedType sipCanConvertToType\n"
+"#define sipConvertToInstance(o, wt, t, f, s, e) sipConvertToType((o), (wt)->type, (t), (f), (s), (e))\n"
+"#define sipConvertToMappedType sipConvertToType\n"
+"#define sipForceConvertToInstance(o, wt, t, f, s, e) sipForceConvertToType((o), (wt)->type, (t), (f), (s), (e))\n"
+"#define sipForceConvertToMappedType sipForceConvertToType\n"
+"#define sipConvertFromInstance(p, wt, t) sipConvertFromType((p), (wt)->type, (t))\n"
+"#define sipConvertFromMappedType sipConvertFromType\n"
+"#define sipConvertFromNamedEnum(v, pt) sipConvertFromEnum((v), ((sipEnumTypeObject *)(pt))->type)\n"
+"#define sipConvertFromNewInstance(p, wt, t) sipConvertFromNewType((p), (wt)->type, (t))\n"
,mname
,mname
,mname
@@ -704,27 +700,11 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
,mname);
/* The name strings. */
- noIntro = TRUE;
-
- for (nd = pt->namecache; nd != NULL; nd = nd->next)
- {
- if (!isUsedName(nd))
- continue;
-
- if (noIntro)
- {
- prcode(fp,
+ prcode(fp,
"\n"
"/* The strings used by this module. */\n"
- );
-
- noIntro = FALSE;
- }
-
- prcode(fp,
-"extern char %N[];\n"
- , nd);
- }
+"extern const char *sipStrings_%s;\n"
+ , mname);
/* The unscoped enum macros. */
generateEnumMacros(pt, mod, NULL, fp);
@@ -748,20 +728,16 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
, mname, mld->module->name);
}
- if (optQ_OBJECT4(pt))
- /*
- * Note that the third argument is no longer used and is there only to
- * preserve backwards binary compatibility.
- */
+ if (pluginPyQt4(pt))
prcode(fp,
"\n"
-"typedef const QMetaObject *(*sip_qt_metaobject_func)(sipWrapper *,sipWrapperType *,const QMetaObject *);\n"
+"typedef const QMetaObject *(*sip_qt_metaobject_func)(sipSimpleWrapper *,sipTypeDef *);\n"
"extern sip_qt_metaobject_func sip_%s_qt_metaobject;\n"
"\n"
-"typedef int (*sip_qt_metacall_func)(sipWrapper *,sipWrapperType *,QMetaObject::Call,int,void **);\n"
+"typedef int (*sip_qt_metacall_func)(sipSimpleWrapper *,sipTypeDef *,QMetaObject::Call,int,void **);\n"
"extern sip_qt_metacall_func sip_%s_qt_metacall;\n"
"\n"
-"typedef int (*sip_qt_metacast_func)(sipWrapper *,sipWrapperType *,const char *);\n"
+"typedef int (*sip_qt_metacast_func)(sipSimpleWrapper *,sipTypeDef *,const char *);\n"
"extern sip_qt_metacast_func sip_%s_qt_metacast;\n"
, mname
, mname
@@ -842,13 +818,13 @@ static void generateCompositeCpp(sipSpec *pt, const char *codeDir)
" sipModule = Py_InitModule(\"%s\", 0);\n"
" sipModuleDict = PyModule_GetDict(sipModule);\n"
"\n"
- , pt->module->fullname);
+ , pt->module->fullname->text);
for (mod = pt->modules; mod != NULL; mod = mod->next)
if (mod->container == pt->module)
prcode(fp,
" sip_import_component_module(sipModuleDict, \"%s\");\n"
- , mod->fullname);
+ , mod->fullname->text);
prcode(fp,
"\n"
@@ -921,7 +897,7 @@ static void generateConsolidatedCpp(sipSpec *pt, const char *codeDir,
for (mod = pt->modules; mod != NULL; mod = mod->next)
if (mod->container == pt->module)
prcode(fp,
-" {\"%s\", sip_init_%s},\n"
+" {%N, sip_init_%s},\n"
, mod->fullname, mod->name);
prcode(fp,
@@ -1001,7 +977,7 @@ static void generateComponentCpp(sipSpec *pt, const char *codeDir,
" Py_XDECREF(sip_result);\n"
" Py_DECREF(sip_mod);\n"
"}\n"
- , pt->module->fullname);
+ , pt->module->fullname->text);
closeFile(fp);
free(cppfile);
@@ -1013,28 +989,23 @@ static void generateComponentCpp(sipSpec *pt, const char *codeDir,
*/
static void generateNameCache(sipSpec *pt, FILE *fp)
{
- int noIntro = TRUE;
nameDef *nd;
- for (nd = pt->namecache; nd != NULL; nd = nd->next)
- {
- if (!isUsedName(nd))
- continue;
-
- if (noIntro)
- {
- prcode(fp,
+ prcode(fp,
"\n"
"/* Define the strings used by this module. */\n"
- );
+"const char *sipStrings_%s =", pt->module->name);
- noIntro = FALSE;
- }
+ for (nd = pt->namecache; nd != NULL; nd = nd->next)
+ {
+ if (!isUsedName(nd) || isSubstring(nd))
+ continue;
- prcode(fp,
-"char %N[] = \"%s\";\n"
- , nd, nd->text);
+ prcode(fp, "\n"
+" \"%s\\0\"", nd->text);
}
+
+ prcode(fp, ";\n");
}
@@ -1046,15 +1017,16 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
{
char *cppfile;
const char *mname = mod->name;
- int noIntro, nrSccs = 0, files_in_part, max_per_part, this_part, mod_nr;
+ int nrSccs = 0, files_in_part, max_per_part, this_part, mod_nr, enum_idx;
int is_inst_class, is_inst_voidp, is_inst_char, is_inst_string;
int is_inst_int, is_inst_long, is_inst_ulong, is_inst_longlong;
- int is_inst_ulonglong, is_inst_double, is_inst_enum, nr_enummembers;
+ int is_inst_ulonglong, is_inst_double, nr_enummembers;
int hasexternal = FALSE, slot_extenders = FALSE, ctor_extenders = FALSE;
FILE *fp;
moduleListDef *mld;
classDef *cd;
memberDef *md;
+ enumDef *ed;
ifaceFileDef *iff;
virtHandlerDef *vhd;
exceptionDef *xd;
@@ -1098,15 +1070,11 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
if (mod->qobjclass >= 0)
prcode(fp,
"\n"
-"#define sipQtIsQtSignal 0\n"
-"#define sipQtCreateUniversalSignalShortcut 0\n"
"#define sipQtCreateUniversalSignal 0\n"
-"#define sipQtFindUniversalSignalShortcut 0\n"
"#define sipQtFindUniversalSignal 0\n"
-"#define sipQtEmitSignalShortcut 0\n"
-"#define sipQtEmitSignal 0\n"
-"#define sipQtCreateUniversalSlotEx 0\n"
-"#define sipQtRegisterMetaType 0\n"
+"#define sipQtSignalRelay 0\n"
+"#define sipQtConnectPySignal 0\n"
+"#define sipQtDisconnectPySignal 0\n"
);
/* Define the names. */
@@ -1231,189 +1199,190 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
/* Generate the global access functions. */
generateAccessFunctions(pt, mod, NULL, fp);
- /* Generate the module data structures. */
- if (mod->nrclasses > 0)
- {
- nrSccs = generateSubClassConvertors(pt, mod, fp);
-
- prcode(fp,
-"\n"
-"\n"
-"/*\n"
-" * This defines each class in this module. The values are replaced by the\n"
-" * proper Python types during the export process.\n"
-" */\n"
-"static sipWrapperType *typesTable[] = {\n"
- );
+ /* Generate any sub-class convertors. */
+ nrSccs = generateSubClassConvertors(pt, mod, fp);
- generateClassTableEntries(mod, &mod->root, fp);
+ /* Generate the external classes table if needed. */
+ for (cd = pt->classes; cd != NULL; cd = cd->next)
+ {
+ if (!isExternal(cd))
+ continue;
- prcode(fp,
-"};\n"
- );
+ if (cd->iff->module != mod)
+ continue;
- /* Generate the external classes table if needed. */
- for (cd = pt->classes; cd != NULL; cd = cd->next)
+ if (!hasexternal)
{
- if (!isExternal(cd))
- continue;
-
- if (cd->iff->module != mod)
- continue;
-
- if (!hasexternal)
- {
- prcode(fp,
+ prcode(fp,
"\n"
"\n"
"/* This defines each external type declared in this module, */\n"
"static sipExternalTypeDef externalTypesTable[] = {\n"
- );
+ );
- hasexternal = TRUE;
- }
+ hasexternal = TRUE;
+ }
- prcode(fp,
+ prcode(fp,
" {%d, \"", cd->classnr);
- prScopedName(fp, classFQCName(cd), ".");
- prcode(fp,"\"},\n"
- );
- }
+ prScopedName(fp, classFQCName(cd), ".");
+ prcode(fp,"\"},\n"
+ );
+ }
- if (hasexternal)
- prcode(fp,
+ if (hasexternal)
+ prcode(fp,
" {-1, NULL}\n"
"};\n"
- );
- }
+ );
- if (mod->nrmappedtypes > 0)
+ /* Generate any enum slot tables. */
+ for (ed = pt->enums; ed != NULL; ed = ed->next)
{
- mappedTypeDef *mtd;
- argDef type;
+ memberDef *slot;
- memset(&type, 0, sizeof (argDef));
+ if (ed->module != mod || ed->fqcname == NULL)
+ continue;
+
+ if (ed->slots == NULL)
+ continue;
+
+ for (slot = ed->slots; slot != NULL; slot = slot->next)
+ generateSlot(mod, NULL, ed, slot, fp);
prcode(fp,
"\n"
-"\n"
-"/* This defines each mapped type in this module. */\n"
-"static sipMappedType *mappedTypesTable[] = {\n"
- );
+"static sipPySlotDef slots_%C[] = {\n"
+ , ed->fqcname);
- for (mtd = pt->mappedtypes; mtd != NULL; mtd = mtd->next)
+ for (slot = ed->slots; slot != NULL; slot = slot->next)
{
- if (mtd->iff->module != mod)
- continue;
+ const char *stype;
- type.atype = mapped_type;
- type.u.mtd = mtd;
-
- prcode(fp,
-" &sipMappedTypeDef_%T,\n"
- ,&type);
+ if ((stype = slotName(slot->slot)) != NULL)
+ prcode(fp,
+" {(void *)slot_%C_%s, %s},\n"
+ , ed->fqcname, slot->pyname->text, stype);
}
prcode(fp,
-" 0\n"
+" {0, (sipPySlotType)0}\n"
"};\n"
+"\n"
);
}
- if (mod->nrenums > 0)
+ /* Generate the enum type structures. */
+ enum_idx = 0;
+
+ for (ed = pt->enums; ed != NULL; ed = ed->next)
{
- enumDef *ed;
+ if (ed->module != mod || ed->fqcname == NULL)
+ continue;
- prcode(fp,
-"\n"
-"\n"
-"/* Define each named enum in this module. */\n"
- );
+ if (ed->ecd != NULL && isTemplateClass(ed->ecd))
+ continue;
- /* Generate any slot tables. */
- for (ed = pt->enums; ed != NULL; ed = ed->next)
+ if (enum_idx == 0)
{
- memberDef *slot;
-
- if (ed->module != mod || ed->fqcname == NULL)
- continue;
+ prcode(fp,
+"static sipEnumTypeDef enumTypes[] = {\n"
+ );
+ }
- if (ed->slots == NULL)
- continue;
+ ed->enum_idx = enum_idx++;
- for (slot = ed->slots; slot != NULL; slot = slot->next)
- generateSlot(mod, NULL, ed, slot, fp);
+ prcode(fp,
+" {{0, 0, 0, SIP_TYPE_ENUM, %n, {0}}, %n, ", ed->cname, ed->pyname);
- prcode(fp,
-"\n"
-"static sipPySlotDef slots_%C[] = {\n"
- , ed->fqcname);
+ if (ed->ecd == NULL)
+ prcode(fp, "-1");
+ else
+ prcode(fp, "%d", ed->ecd->classnr);
- for (slot = ed->slots; slot != NULL; slot = slot->next)
- {
- const char *stype;
+ if (ed->slots != NULL)
+ prcode(fp, ", slots_%C", ed->fqcname);
+ else
+ prcode(fp, ", NULL");
- if ((stype = slotName(slot->slot)) != NULL)
- prcode(fp,
-" {(void *)slot_%C_%s, %s},\n"
- , ed->fqcname, slot->pyname->text, stype);
- }
+ prcode(fp, "},\n"
+ );
+ }
- prcode(fp,
-" {0, (sipPySlotType)0}\n"
+ if (enum_idx != 0)
+ prcode(fp,
"};\n"
-"\n"
- );
- }
+ );
+
+ nr_enummembers = generateEnumMemberTable(pt, mod, NULL, fp);
+
+ /* Generate the types table. */
+ if (mod->nrtypes > 0)
+ {
+ int i;
+ argDef *ad;
prcode(fp,
-"static sipEnumDef enumTypesTable[] = {\n"
+"\n"
+"\n"
+"/*\n"
+" * This defines each type in this module.\n"
+" */\n"
+"static sipTypeDef *typesTable[] = {\n"
);
- for (ed = pt->enums; ed != NULL; ed = ed->next)
+ for (ad = mod->types, i = 0; i < mod->nrtypes; ++i, ++ad)
{
- const char *emname;
-
- if (ed->module != mod || ed->fqcname == NULL)
- continue;
-
- if (ed->ecd != NULL && isTemplateClass(ed->ecd))
- continue;
+ const char *type_prefix, *type_suffix;
- if (ed->ecd == NULL)
- emname = mname;
- else if (ed->ecd->real == NULL)
- emname = ed->module->name;
+ if (pluginPyQt4(pt))
+ {
+ type_prefix = "pyqt4";
+ type_suffix = ".super";
+ }
+ else if (pluginPyQt3(pt) && ad->atype == class_type)
+ {
+ type_prefix = "pyqt3";
+ type_suffix = ".super";
+ }
else
- emname = ed->ecd->real->iff->module->name;
-
- prcode(fp,
-" {\"%s.%P\", ", emname, ed->ecd, ed->pyname->text);
+ {
+ type_prefix = "sip";
+ type_suffix = "";
+ }
- prcode(fp, "\"%S\", ", ed->fqcname);
+ switch (ad->atype)
+ {
+ case class_type:
+ if (isExternal(ad->u.cd))
+ prcode(fp,
+" 0,\n"
+ );
+ else
+ prcode(fp,
+" &%sType_%s_%C%s.ctd_base,\n"
+ , type_prefix, mod->name, classFQCName(ad->u.cd), type_suffix);
- if (ed->ecd == NULL)
- prcode(fp, "-1");
- else
- prcode(fp, "%d", ed->ecd->classnr);
+ break;
- if (ed->slots != NULL)
- prcode(fp, ", slots_%C", ed->fqcname);
- else
- prcode(fp, ", NULL");
+ case mapped_type:
+ prcode(fp,
+" &%sMappedTypeDef_%T%s.mtd_base,\n"
+ , type_prefix, ad, type_suffix);
+ break;
- prcode(fp, "},\n"
- );
+ case enum_type:
+ prcode(fp,
+" &enumTypes[%d].etd_base,\n"
+ , ad->u.ed->enum_idx);
+ break;
+ }
}
prcode(fp,
"};\n"
);
-
- nr_enummembers = generateEnumMemberTable(pt, mod, NULL, fp);
}
- else
- nr_enummembers = 0;
if (mod->nrtypedefs > 0)
{
@@ -1423,147 +1392,32 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
"\n"
"\n"
"/*\n"
-" * These define each typedef in this module. They are only needed in case\n"
-" * they are used as arguments to Qt signals.\n"
+" * These define each typedef in this module.\n"
" */\n"
-"\n"
"static sipTypedefDef typedefsTable[] = {\n"
);
for (td = pt->typedefs; td != NULL; td = td->next)
{
- const char *tdmname, *sat;
- scopedNameDef *fqname;
- argDef *argtype;
-
if (td->module != mod)
continue;
- fqname = NULL;
- tdmname = NULL;
- argtype = NULL;
- sat = "unknown";
-
- switch (td->type.atype)
- {
- case string_type:
- sat = (td->type.nrderefs == 0 ? "char" : "string");
- break;
-
- case sstring_type:
- sat = (td->type.nrderefs == 0 ? "schar" : "sstring");
- break;
-
- case ustring_type:
- sat = (td->type.nrderefs == 0 ? "uchar" : "ustring");
- break;
-
- case wstring_type:
- sat = (td->type.nrderefs == 0 ? "wchar" : "wstring");
- break;
-
- case short_type:
- sat = "short";
- break;
-
- case ushort_type:
- sat = "ushort";
- break;
-
- case cint_type:
- case int_type:
- sat = "int";
- break;
-
- case uint_type:
- sat = "uint";
- break;
-
- case long_type:
- sat = "long";
- break;
-
- case ulong_type:
- sat = "ulong";
- break;
-
- case longlong_type:
- sat = "longlong";
- break;
-
- case ulonglong_type:
- sat = "ulonglong";
- break;
-
- case cfloat_type:
- case float_type:
- sat = "float";
- break;
-
- case cdouble_type:
- case double_type:
- sat = "double";
- break;
-
- case bool_type:
- case cbool_type:
- sat = "bool";
- break;
-
- case fake_void_type:
- case void_type:
- if (td->type.nrderefs != 0)
- sat = "void";
- break;
-
- case enum_type:
- if ((fqname = td->type.u.ed->fqcname) != NULL)
- {
- sat = "enum";
-
- if (td->type.u.ed->module != mod)
- tdmname = td->type.u.ed->module->fullname;
- }
- break;
-
- case class_type:
- sat = "class";
- fqname = classFQCName(td->type.u.cd);
-
- if (td->type.u.cd->iff->module != mod)
- tdmname = td->type.u.cd->iff->module->fullname;
- break;
-
- case mapped_type:
- sat = "mtype";
- argtype = &td->type.u.mtd->type;
-
- if (td->type.u.mtd->iff->module != mod)
- tdmname = td->type.u.mtd->iff->module->fullname;
- break;
- }
-
prcode(fp,
-" {\"%S\", %s_sat", td->fqname, sat);
-
- if (argtype != NULL)
- prcode(fp, ", \"%b\"", argtype);
- else if (fqname != NULL)
- prcode(fp, ", \"%S\"", fqname);
- else
- prcode(fp, ", NULL");
+" {\"%S\", \"", td->fqname);
- if (tdmname != NULL)
- prcode(fp, ", \"%s\"", tdmname);
+ /* The default behaviour isn't right in a couple of cases. */
+ if (td->type.atype == longlong_type)
+ prcode(fp, "long long");
+ else if (td->type.atype == ulonglong_type)
+ prcode(fp, "unsigned long long");
else
- prcode(fp, ", NULL");
+ prcode(fp, "%b", &td->type);
- prcode(fp, "},\n"
+ prcode(fp, "\"},\n"
);
}
prcode(fp,
-" {NULL, unknown_sat, NULL, NULL}\n"
"};\n"
);
}
@@ -1603,7 +1457,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
for (mld = mod->allimports; mld != NULL; mld = mld->next)
prcode(fp,
" {\"%s\", %d, NULL},\n"
- , mld->module->fullname, mld->module->version);
+ , mld->module->fullname->text, mld->module->version);
prcode(fp,
" {NULL, -1, NULL}\n"
@@ -1701,7 +1555,6 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
is_inst_longlong = generateLongLongs(pt, mod, NULL, fp);
is_inst_ulonglong = generateUnsignedLongLongs(pt, mod, NULL, fp);
is_inst_double = generateDoubles(pt, mod, NULL, fp);
- is_inst_enum = generateEnums(pt, mod, NULL, fp);
/* Generate any exceptions table. */
if (mod->nrexceptions > 0)
@@ -1720,25 +1573,18 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
"\n"
"static sipQtAPI qtAPI = {\n"
" &typesTable[%d],\n"
-" sipQtIsQtSignal,\n"
-" sipQtCreateUniversalSignalShortcut,\n"
" sipQtCreateUniversalSignal,\n"
-" sipQtFindUniversalSignalShortcut,\n"
" sipQtFindUniversalSignal,\n"
-" sipQtEmitSignalShortcut,\n"
-" sipQtEmitSignal,\n"
" sipQtCreateUniversalSlot,\n"
" sipQtDestroyUniversalSlot,\n"
" sipQtFindSlot,\n"
" sipQtConnect,\n"
" sipQtDisconnect,\n"
-" sipQtSignalsBlocked,\n"
-" sipQtGetSender,\n"
-" sipQtForgetSender,\n"
" sipQtSameSignalSlotName,\n"
-" sipQtFindConnection,\n"
-" sipQtCreateUniversalSlotEx,\n"
-" sipQtRegisterMetaType\n"
+" sipQtFindSipslot,\n"
+" sipQtSignalRelay,\n"
+" sipQtConnectPySignal,\n"
+" sipQtDisconnectPySignal\n"
"};\n"
, mod->qobjclass);
@@ -1747,50 +1593,47 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
"\n"
"/* This defines this module. */\n"
"sipExportedModuleDef sipModuleAPI_%s = {\n"
-" NULL,\n"
+" 0,\n"
" SIP_API_MINOR_NR,\n"
-" \"%s\",\n"
-" NULL,\n"
+" %n,\n"
+" 0,\n"
" %d,\n"
+" sipStrings_%s,\n"
" %s,\n"
" %s,\n"
" %d,\n"
" %s,\n"
" %s,\n"
-" %s,\n"
" %d,\n"
-" NULL,\n"
" %s,\n"
" %d,\n"
" %s,\n"
" %s,\n"
" %s,\n"
-" %s,\n"
-" {%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s},\n"
+" {%s, %s, %s, %s, %s, %s, %s, %s, %s, %s},\n"
" %s,\n"
" %s,\n"
" %s,\n"
" %s,\n"
" %s,\n"
-" NULL\n"
+" 0\n"
"};\n"
, mname
, mod->fullname
, mod->version
+ , mname
, mod->allimports != NULL ? "importsTable" : "NULL"
, mod->qobjclass >= 0 ? "&qtAPI" : "NULL"
- , mod->nrclasses
- , mod->nrclasses > 0 ? "typesTable" : "NULL"
+ , mod->nrtypes
+ , mod->nrtypes > 0 ? "typesTable" : "NULL"
, hasexternal ? "externalTypesTable" : "NULL"
- , mod->nrmappedtypes > 0 ? "mappedTypesTable" : "NULL"
- , mod->nrenums
- , mod->nrenums > 0 ? "enumTypesTable" : "NULL"
, nr_enummembers
, nr_enummembers > 0 ? "enummembers" : "NULL"
+ , mod->nrtypedefs
, mod->nrtypedefs > 0 ? "typedefsTable" : "NULL"
, mod->nrvirthandlers > 0 ? "virtHandlersTable" : "NULL"
, nrSccs > 0 ? "convertorsTable" : "NULL"
- , is_inst_class ? "classInstances" : "NULL"
+ , is_inst_class ? "typeInstances" : "NULL"
, is_inst_voidp ? "voidPtrInstances" : "NULL"
, is_inst_char ? "charInstances" : "NULL"
, is_inst_string ? "stringInstances" : "NULL"
@@ -1800,7 +1643,6 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
, is_inst_longlong ? "longLongInstances" : "NULL"
, is_inst_ulonglong ? "unsignedLongLongInstances" : "NULL"
, is_inst_double ? "doubleInstances" : "NULL"
- , is_inst_enum ? "enumInstances" : "NULL"
, mod->license != NULL ? "&module_license" : "NULL"
, mod->nrexceptions > 0 ? "exceptionsTable" : "NULL"
, slot_extenders ? "slotExtenders" : "NULL"
@@ -1820,7 +1662,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
"const sipExportedModuleDef *sipModuleAPI_%s_%s;\n"
, mname, mld->module->name);
- if (optQ_OBJECT4(pt))
+ if (pluginPyQt4(pt))
prcode(fp,
"\n"
"sip_qt_metaobject_func sip_%s_qt_metaobject;\n"
@@ -1848,6 +1690,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
for (md = mod->othfuncs; md != NULL; md = md->next)
if (md->slot == no_slot)
+ {
if (noArgParser(md))
prcode(fp,
" {%N, (PyCFunction)func_%s, METH_KEYWORDS, NULL},\n"
@@ -1856,6 +1699,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
prcode(fp,
" {%N, func_%s, METH_VARARGS, NULL},\n"
, md->pyname, md->pyname->text);
+ }
prcode(fp,
" {0, 0, 0, 0}\n"
@@ -1871,16 +1715,40 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
prcode(fp,
" /* Initialise the module and get it's dictionary. */\n"
-" sipModule = Py_InitModule((char *)sipModuleAPI_%s.em_name,sip_methods);\n"
+" sipModule = Py_InitModule((char *)%N,sip_methods);\n"
" sipModuleDict = PyModule_GetDict(sipModule);\n"
"\n"
- , mname);
+ , mod->fullname);
generateSipImport(mod, fp);
+ /* Generate any initialisation code. */
+ generateCppCodeBlock(mod->initcode, fp);
+
prcode(fp,
" /* Export the module and publish it's API. */\n"
-" if (sipAPI_%s->api_export_module(&sipModuleAPI_%s,SIP_API_MAJOR_NR,SIP_API_MINOR_NR,sipModuleDict) < 0)\n"
+" if (sipAPI_%s->api_export_module(&sipModuleAPI_%s,SIP_API_MAJOR_NR,SIP_API_MINOR_NR,0) < 0)\n"
+" return;\n"
+ , mname
+ , mname);
+
+ if (pluginPyQt4(pt))
+ {
+ /* Import the helpers. */
+ prcode(fp,
+"\n"
+" sip_%s_qt_metaobject = (sip_qt_metaobject_func)sipImportSymbol(\"qtcore_qt_metaobject\");\n"
+" sip_%s_qt_metacall = (sip_qt_metacall_func)sipImportSymbol(\"qtcore_qt_metacall\");\n"
+" sip_%s_qt_metacast = (sip_qt_metacast_func)sipImportSymbol(\"qtcore_qt_metacast\");\n"
+"\n"
+ , mname
+ , mname
+ , mname);
+ }
+
+ prcode(fp,
+" /* Initialise the module now all its dependencies have been set up. */\n"
+" if (sipAPI_%s->api_init_module(&sipModuleAPI_%s,sipModuleDict) < 0)\n"
" return;\n"
, mname
, mname);
@@ -1902,8 +1770,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
++mod_nr;
}
- generateClassesInline(pt, mod, fp);
- generateEnumsInline(pt, mod, fp);
+ generateTypesInline(pt, mod, fp);
/* Create any exceptions. */
for (xd = pt->exceptions; xd != NULL; xd = xd->next)
@@ -1933,32 +1800,9 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
, xd->pyname, xd->exceptionnr);
}
- /* Generate any Qt meta type registration calls. */
- if (optRegisterTypes(pt))
- for (cd = pt->classes; cd != NULL; cd = cd->next)
- if (cd->iff->module == mod)
- if (registerQtMetaType(cd))
- prcode(fp,
-" sipRegisterMetaType(qRegisterMetaType<%S>(\"%S\"), sipClass_%C);\n"
- , classFQCName(cd), classFQCName(cd), classFQCName(cd));
-
/* Generate any post-initialisation code. */
generateCppCodeBlock(mod->postinitcode, fp);
- /*
- * This has to be done after the post-initialisation code in case this
- * module is exporting the symbol.
- */
- if (optQ_OBJECT4(pt))
- prcode(fp,
-"\n"
-" sip_%s_qt_metaobject = (sip_qt_metaobject_func)sipImportSymbol(\"qtcore_qt_metaobject\");\n"
-" sip_%s_qt_metacall = (sip_qt_metacall_func)sipImportSymbol(\"qtcore_qt_metacall\");\n"
-" sip_%s_qt_metacast = (sip_qt_metacast_func)sipImportSymbol(\"qtcore_qt_metacast\");\n"
- , mname
- , mname
- , mname);
-
prcode(fp,
"}\n"
);
@@ -2082,6 +1926,8 @@ static int generateSubClassConvertors(sipSpec *pt, moduleDef *mod, FILE *fp)
for (cd = pt->classes; cd != NULL; cd = cd->next)
{
+ int needs_sipClass;
+
if (cd->iff->module != mod)
continue;
@@ -2096,56 +1942,49 @@ static int generateSubClassConvertors(sipSpec *pt, moduleDef *mod, FILE *fp)
if (!generating_c)
prcode(fp,
-"extern \"C\" {static sipWrapperType *sipSubClass_%C(void **);}\n"
+"extern \"C\" {static const sipTypeDef *sipSubClass_%C(void **);}\n"
, classFQCName(cd));
+ /* Allow the deprecated use of sipClass rather than sipType. */
+ needs_sipClass = usedInCode(cd->convtosubcode, "sipClass");
+
prcode(fp,
-"static sipWrapperType *sipSubClass_%C(void **sipCppRet)\n"
+"static const sipTypeDef *sipSubClass_%C(void **sipCppRet)\n"
"{\n"
" %S *sipCpp = reinterpret_cast<%S *>(*sipCppRet);\n"
-" sipWrapperType *sipClass;\n"
-"\n"
, classFQCName(cd)
, classFQCName(cd->subbase), classFQCName(cd->subbase));
- generateCppCodeBlock(cd->convtosubcode, fp);
-
- prcode(fp,
+ if (needs_sipClass)
+ prcode(fp,
+" sipWrapperType *sipClass;\n"
"\n"
-" return sipClass;\n"
-"}\n"
- );
-
- ++nrSccs;
- }
-
- return nrSccs;
-}
-
+ );
+ else
+ prcode(fp,
+" const sipTypeDef *sipType;\n"
+"\n"
+ );
-/*
- * Generate an entry for a class in the classes table and all its children.
- */
-static void generateClassTableEntries(moduleDef *mod, nodeDef *nd, FILE *fp)
-{
- nodeDef *cnd;
+ generateCppCodeBlock(cd->convtosubcode, fp);
- /* Generate the entry if it's not the root. */
- if (nd->cd != NULL)
- {
- if (isExternal(nd->cd))
+ if (needs_sipClass)
prcode(fp,
-" 0,\n"
+"\n"
+" return (sipClass ? sipClass->type : 0);\n"
+"}\n"
);
else
prcode(fp,
-" (sipWrapperType *)(void *)&sipType_%s_%C,\n"
- , mod->name, classFQCName(nd->cd));
+"\n"
+" return sipType;\n"
+"}\n"
+ );
+
+ ++nrSccs;
}
- /* Generate all it's children. */
- for (cnd = nd->child; cnd != NULL; cnd = cnd->next)
- generateClassTableEntries(mod, cnd, fp);
+ return nrSccs;
}
@@ -2214,6 +2053,7 @@ static void generateOrdinaryFunction(moduleDef *mod, classDef *cd,
const char *self = (generating_c ? "sipSelf" : "");
if (!generating_c)
+ {
if (noArgParser(md))
prcode(fp,
"extern \"C\" {static PyObject *func_%s(PyObject *,PyObject *,PyObject *);}\n"
@@ -2222,6 +2062,7 @@ static void generateOrdinaryFunction(moduleDef *mod, classDef *cd,
prcode(fp,
"extern \"C\" {static PyObject *func_%s(PyObject *,PyObject *);}\n"
, md->pyname->text);
+ }
if (noArgParser(md))
prcode(fp,
@@ -2314,7 +2155,7 @@ static int generateEnumMemberTable(sipSpec *pt, moduleDef *mod, classDef *cd,
/* Create a table so they can be sorted. */
- etab = sipMalloc(sizeof (enumMemberDef *) * nr_members);
+ etab = sipCalloc(nr_members, sizeof (enumMemberDef *));
et = etab;
@@ -2382,7 +2223,6 @@ static int generateEnumMemberTable(sipSpec *pt, moduleDef *mod, classDef *cd,
* The qsort helper to compare two enumMemberDef structures based on the name
* of the enum member.
*/
-
static int compareEnumMembers(const void *m1,const void *m2)
{
return strcmp((*(enumMemberDef **)m1)->pyname->text,
@@ -2432,58 +2272,10 @@ static void generateAccessFunctions(sipSpec *pt, moduleDef *mod, classDef *cd,
/*
- * Generate the inline code to add a set of enum instances to a dictionary.
- */
-static void generateEnumsInline(sipSpec *pt, moduleDef *mod, FILE *fp)
-{
- int noIntro;
- varDef *vd;
-
- noIntro = TRUE;
-
- for (vd = pt->vars; vd != NULL; vd = vd->next)
- {
- if (vd->module != mod)
- continue;
-
- if (vd->type.atype != enum_type)
- continue;
-
- if (needsHandler(vd))
- continue;
-
- /* Skip enums that don't need inline code. */
- if (generating_c || vd->accessfunc != NULL || vd->type.nrderefs != 0)
- continue;
-
- if (noIntro)
- {
- prcode(fp,
-"\n"
-" /* Define the enum instances that have to be added inline. */\n"
- );
-
- noIntro = FALSE;
- }
-
- prcode(fp,
-" sipAddEnumInstance(");
-
- if (vd->ecd == NULL)
- prcode(fp, "sipModuleDict");
- else
- prcode(fp, "(PyObject *)sipClass_%C", classFQCName(vd->ecd));
-
- prcode(fp, ",%N,(int)%S,sipEnum_%C);\n"
- , vd->pyname, vd->fqcname, vd->type.u.ed->fqcname);
- }
-}
-
-
-/*
- * Generate the inline code to add a set of class instances to a dictionary.
+ * Generate the inline code to add a set of generated type instances to a
+ * dictionary.
*/
-static void generateClassesInline(sipSpec *pt, moduleDef *mod, FILE *fp)
+static void generateTypesInline(sipSpec *pt, moduleDef *mod, FILE *fp)
{
int noIntro;
varDef *vd;
@@ -2495,7 +2287,7 @@ static void generateClassesInline(sipSpec *pt, moduleDef *mod, FILE *fp)
if (vd->module != mod)
continue;
- if (vd->type.atype != class_type && vd->type.atype != mapped_type)
+ if (vd->type.atype != class_type && vd->type.atype != mapped_type && vd->type.atype != enum_type)
continue;
if (needsHandler(vd))
@@ -2510,25 +2302,21 @@ static void generateClassesInline(sipSpec *pt, moduleDef *mod, FILE *fp)
prcode(fp,
"\n"
" /*\n"
-" * Define the class and mapped type instances that have to be added\n"
-" * inline.\n"
+" * Define the class, mapped type and enum instances that have to be\n"
+" * added inline.\n"
" */\n"
);
noIntro = FALSE;
}
- if (vd->type.atype == class_type)
- prcode(fp,
-" sipAddClassInstance(");
- else
- prcode(fp,
-" sipAddMappedTypeInstance(");
+ prcode(fp,
+" sipAddTypeInstance(");
if (vd->ecd == NULL)
prcode(fp, "sipModuleDict");
else
- prcode(fp, "(PyObject *)sipClass_%C", classFQCName(vd->ecd));
+ prcode(fp, "(PyObject *)sipTypeAsPyTypeObject(sipType_%C)", classFQCName(vd->ecd));
prcode(fp, ",%N,", vd->pyname);
@@ -2538,10 +2326,13 @@ static void generateClassesInline(sipSpec *pt, moduleDef *mod, FILE *fp)
prcode(fp, "&%S", vd->fqcname);
if (vd->type.atype == class_type)
- prcode(fp, ",sipClass_%C);\n"
+ prcode(fp, ",sipType_%C);\n"
, classFQCName(vd->type.u.cd));
+ else if (vd->type.atype == enum_type)
+ prcode(fp, ",sipType_%C);\n"
+ , vd->type.u.ed->fqcname);
else
- prcode(fp, ",sipMappedType_%T);\n"
+ prcode(fp, ",sipType_%T);\n"
, &vd->type);
}
}
@@ -2560,12 +2351,10 @@ static int generateClasses(sipSpec *pt, moduleDef *mod, classDef *cd, FILE *fp)
for (vd = pt->vars; vd != NULL; vd = vd->next)
{
- scopedNameDef *vcname;
-
if (vd->ecd != cd || vd->module != mod)
continue;
- if (vd->type.atype != class_type)
+ if (vd->type.atype != class_type && (vd->type.atype != enum_type || vd->type.u.ed->fqcname == NULL))
continue;
if (needsHandler(vd))
@@ -2587,46 +2376,51 @@ static int generateClasses(sipSpec *pt, moduleDef *mod, classDef *cd, FILE *fp)
prcode(fp,
"\n"
"\n"
-"/* Define the class instances to be added to this type dictionary. */\n"
-"static sipClassInstanceDef classInstances_%C[] = {\n"
+"/* Define the class and enum instances to be added to this type dictionary. */\n"
+"static sipTypeInstanceDef typeInstances_%C[] = {\n"
, classFQCName(cd));
else
prcode(fp,
"\n"
"\n"
-"/* Define the class instances to be added to this module dictionary. */\n"
-"static sipClassInstanceDef classInstances[] = {\n"
+"/* Define the class and enum instances to be added to this module dictionary. */\n"
+"static sipTypeInstanceDef typeInstances[] = {\n"
);
noIntro = FALSE;
}
- vcname = classFQCName(vd->type.u.cd);
+ prcode(fp,
+" {%N, ", vd->pyname);
- if (vd->accessfunc != NULL)
- {
- prcode(fp,
-" {%N, (void *)access_%C, &sipClass_%C, SIP_ACCFUNC},\n"
- , vd->pyname, vd->fqcname, vcname);
- }
- else if (vd->type.nrderefs != 0)
- {
- prcode(fp,
-" {%N, &%S, &sipClass_%C, SIP_INDIRECT},\n"
- , vd->pyname, vd->fqcname, vcname);
- }
- else if (isConstArg(&vd->type))
+ if (vd->type.atype == class_type)
{
- prcode(fp,
-" {%N, const_cast<%b *>(&%S), &sipClass_%C, 0},\n"
- , vd->pyname, &vd->type, vd->fqcname, vcname);
+ scopedNameDef *vcname = classFQCName(vd->type.u.cd);
+
+ if (vd->accessfunc != NULL)
+ {
+ prcode(fp, "(void *)access_%C, &sipType_%C, SIP_ACCFUNC", vd->fqcname, vcname);
+ }
+ else if (vd->type.nrderefs != 0)
+ {
+ prcode(fp, "&%S, &sipType_%C, SIP_INDIRECT", vd->fqcname, vcname);
+ }
+ else if (isConstArg(&vd->type))
+ {
+ prcode(fp, "const_cast<%b *>(&%S), &sipType_%C, 0", &vd->type, vd->fqcname, vcname);
+ }
+ else
+ {
+ prcode(fp, "&%S, &sipType_%C, 0", vd->fqcname, vcname);
+ }
}
else
{
- prcode(fp,
-" {%N, &%S, &sipClass_%C, 0},\n"
- , vd->pyname, vd->fqcname, vcname);
+ prcode(fp, "&%S, &sipType_%C, 0", vd->fqcname, vd->type.u.ed->fqcname);
}
+
+ prcode(fp, "},\n"
+ );
}
if (!noIntro)
@@ -2821,67 +2615,6 @@ static int generateStrings(sipSpec *pt, moduleDef *mod, classDef *cd, FILE *fp)
/*
- * Generate the code to add a set of enum instances to a dictionary. Return
- * TRUE if there was at least one.
- */
-static int generateEnums(sipSpec *pt, moduleDef *mod, classDef *cd, FILE *fp)
-{
- int noIntro;
- varDef *vd;
-
- noIntro = TRUE;
-
- for (vd = pt->vars; vd != NULL; vd = vd->next)
- {
- if (vd->ecd != cd || vd->module != mod)
- continue;
-
- if (vd->type.atype != enum_type || vd->type.u.ed->fqcname == NULL)
- continue;
-
- if (needsHandler(vd))
- continue;
-
- /* Skip enums that need inline code. */
- if (!generating_c && vd->accessfunc == NULL && vd->type.nrderefs == 0)
- continue;
-
- if (noIntro)
- {
- if (cd != NULL)
- prcode(fp,
-"\n"
-"\n"
-"/* Define the enum instances to be added to this type dictionary. */\n"
-"static sipEnumInstanceDef enumInstances_%C[] = {\n"
- , classFQCName(cd));
- else
- prcode(fp,
-"\n"
-"\n"
-"/* Define the enum instances to be added to this module dictionary. */\n"
-"static sipEnumInstanceDef enumInstances[] = {\n"
- );
-
- noIntro = FALSE;
- }
-
- prcode(fp,
-" {%N, (int)%S, &sipEnum_%C},\n"
- , vd->pyname, vd->fqcname, vd->type.u.ed->fqcname);
- }
-
- if (!noIntro)
- prcode(fp,
-" {0, 0, 0}\n"
-"};\n"
- );
-
- return !noIntro;
-}
-
-
-/*
* Generate the code to add a set of ints to a dictionary. Return TRUE if
* there was at least one.
*/
@@ -3238,37 +2971,22 @@ static char *createIfaceFileName(const char *codeDir, ifaceFileDef *iff,
*/
static void generateMappedTypeCpp(mappedTypeDef *mtd, sipSpec *pt, FILE *fp)
{
- int need_xfer;
+ int need_xfer, embedded;
+ const char *type_prefix;
- if (optAssignmentHelpers(pt) && !noRelease(mtd))
+ if (pluginPyQt4(pt) && !noRelease(mtd))
{
prcode(fp,
"\n"
"\n"
- );
-
- if (!generating_c)
- prcode(fp,
"extern \"C\" {static void assign_%T(void *, const void*);}\n"
- , &mtd->type);
-
- prcode(fp,
"static void assign_%T(void *sipDst, const void *sipSrc)\n"
"{\n"
- , &mtd->type);
-
- if (generating_c)
- prcode(fp,
-" *(%b *)sipDst = *(const %b *)sipSrc;\n"
- , &mtd->type, &mtd->type);
- else
- prcode(fp,
" *reinterpret_cast<%b *>(sipDst) = *reinterpret_cast<const %b *>(sipSrc);\n"
- , &mtd->type, &mtd->type);
-
- prcode(fp,
"}\n"
- );
+ , &mtd->type
+ , &mtd->type
+ , &mtd->type, &mtd->type);
}
if (!noRelease(mtd))
@@ -3343,14 +3061,34 @@ static void generateMappedTypeCpp(mappedTypeDef *mtd, sipSpec *pt, FILE *fp)
generateCppCodeBlock(mtd->convfromcode,fp);
+ if (pluginPyQt4(pt))
+ {
+ type_prefix = "pyqt4";
+ embedded = TRUE;
+ }
+ else
+ {
+ type_prefix = "sip";
+ embedded = FALSE;
+ }
+
prcode(fp,
"}\n"
"\n"
"\n"
-"sipMappedType sipMappedTypeDef_%T = {\n"
-" \"%B\",\n"
- , &mtd->type
- , &mtd->type);
+"%sMappedTypeDef %sMappedTypeDef_%T = {\n"
+"%s"
+" {\n"
+" 0,\n"
+" 0,\n"
+" 0,\n"
+" SIP_TYPE_MAPPED,\n"
+" %n,\n"
+" {0}\n"
+" },\n"
+ , type_prefix, type_prefix, &mtd->type
+ , (embedded ? "{\n" : "")
+ , mtd->cname);
if (noRelease(mtd))
prcode(fp,
@@ -3362,21 +3100,27 @@ static void generateMappedTypeCpp(mappedTypeDef *mtd, sipSpec *pt, FILE *fp)
, &mtd->type);
prcode(fp,
-" forceConvertTo_%T,\n"
" convertTo_%T,\n"
-" convertFrom_%T,\n"
- , &mtd->type
+" convertFrom_%T\n"
, &mtd->type
, &mtd->type);
- if (optAssignmentHelpers(pt) && !noRelease(mtd))
+ if (embedded)
prcode(fp,
+"},\n"
+ );
+
+ if (pluginPyQt4(pt))
+ {
+ if (!noRelease(mtd))
+ prcode(fp,
" assign_%T\n"
- , &mtd->type);
- else
- prcode(fp,
+ , &mtd->type);
+ else
+ prcode(fp,
" 0\n"
- );
+ );
+ }
prcode(fp,
"};\n"
@@ -3389,7 +3133,6 @@ static void generateMappedTypeCpp(mappedTypeDef *mtd, sipSpec *pt, FILE *fp)
*/
static void generateClassCpp(classDef *cd, sipSpec *pt, FILE *fp)
{
- varDef *vd;
moduleDef *mod = cd->iff->module;
/* Generate any local class code. */
@@ -3400,31 +3143,6 @@ static void generateClassCpp(classDef *cd, sipSpec *pt, FILE *fp)
generateAccessFunctions(pt, mod, cd, fp);
- /* Generate the variable handlers. */
- if (hasVarHandlers(cd))
- {
- for (vd = pt->vars; vd != NULL; vd = vd->next)
- if (vd->ecd == cd && needsHandler(vd))
- generateVariableHandler(cd, vd, fp);
-
- /* Generate the variable table. */
- prcode(fp,
-"\n"
-"PyMethodDef variables_%C[] = {\n"
- ,classFQCName(cd));
-
- for (vd = pt->vars; vd != NULL; vd = vd->next)
- if (vd->ecd == cd && needsHandler(vd))
- prcode(fp,
-" {%N, var_%C, %s, NULL},\n"
- ,vd->pyname,vd->fqcname,(isStaticVar(vd) ? "METH_STATIC" : "0"));
-
- prcode(fp,
-" {0, 0, 0, 0}\n"
-"};\n"
- );
- }
-
if (cd->iff->type != namespace_iface)
generateConvertToDefinitions(NULL,cd,fp);
@@ -3455,7 +3173,7 @@ static sortedMethTab *createFunctionTable(classDef *cd,int *nrp)
/* Create the table of methods. */
- mtab = sipMalloc(sizeof (sortedMethTab) * nr);
+ mtab = sipCalloc(nr, sizeof (sortedMethTab));
/* Initialise the table. */
@@ -3528,7 +3246,7 @@ static sortedMethTab *createMethodTable(classDef *cd, int *nrp)
/* Create the table of methods. */
- mtab = sipMalloc(sizeof (sortedMethTab) * nr);
+ mtab = sipCalloc(nr, sizeof (sortedMethTab));
/* Initialise the table. */
@@ -3724,87 +3442,25 @@ static void generateConvertToDefinitions(mappedTypeDef *mtd,classDef *cd,
"}\n"
);
}
-
- prcode(fp,
-"\n"
-"\n"
- );
-
- if (!generating_c)
- prcode(fp,
-"extern \"C\" {static void *forceConvertTo_%T(PyObject *, int *);}\n"
- , &type);
-
- prcode(fp,
-"static void *forceConvertTo_%T(PyObject *valobj,int *iserrp)\n"
-"{\n"
-" if (*iserrp || valobj == NULL)\n"
-" return NULL;\n"
-"\n"
- ,&type);
-
- if (convtocode != NULL)
- prcode(fp,
-" if (convertTo_%T(valobj,NULL,NULL,NULL))\n"
-" {\n"
-" void *val;\n"
-"\n"
-" /*\n"
-" * Note that we throw away the flag that says if the value\n"
-" * has just been created on the heap or not.\n"
-" */\n"
-" convertTo_%T(valobj,&val,iserrp,NULL);\n"
-"\n"
-" return val;\n"
-" }\n"
- ,&type
- ,&type);
- else
- prcode(fp,
-" if (valobj == Py_None || sipIsSubClassInstance(valobj,sipClass_%T))\n"
-" return sipConvertToCpp(valobj,sipClass_%T,iserrp);\n"
- ,&type
- ,&type);
-
- if (cd != NULL)
- prcode(fp,
-"\n"
-" sipBadClass(%N);\n"
- , iff->name);
- else
- prcode(fp,
-"\n"
-" sipBadClass(\"%B\");\n"
- , &mtd->type);
-
- prcode(fp,
-"\n"
-" *iserrp = 1;\n"
-"\n"
-" return NULL;\n"
-"}\n"
- );
}
/*
- * Generate a variable handler.
+ * Generate a variable getter.
*/
-static void generateVariableHandler(classDef *context, varDef *vd, FILE *fp)
+static void generateVariableGetter(classDef *context, varDef *vd, FILE *fp)
{
argType atype = vd->type.atype;
- const char *first_arg;
- int no_setter;
-
- no_setter = (vd->type.nrderefs == 0 && isConstArg(&vd->type));
+ const char *first_arg, *last_arg;
+ int needsNew;
if (generating_c || !isStaticVar(vd))
first_arg = "sipSelf";
- else if (usedInCode(vd->getcode, "sipPyType") || usedInCode(vd->setcode, "sipPyType"))
- first_arg = "sipPyType";
else
first_arg = "";
+ last_arg = (generating_c || usedInCode(vd->getcode, "sipPyType")) ? "sipPyType" : "";
+
prcode(fp,
"\n"
"\n"
@@ -3812,15 +3468,21 @@ static void generateVariableHandler(classDef *context, varDef *vd, FILE *fp)
if (!generating_c)
prcode(fp,
-"extern \"C\" {static PyObject *var_%C(PyObject *, PyObject *);}\n"
+"extern \"C\" {static PyObject *varget_%C(void *, PyObject *);}\n"
, vd->fqcname);
prcode(fp,
-"static PyObject *var_%C(PyObject *%s,PyObject *sipPy)\n"
+"static PyObject *varget_%C(void *%s, PyObject *%s)\n"
"{\n"
- , vd->fqcname, first_arg);
+ , vd->fqcname, first_arg, last_arg);
- if (vd->getcode == NULL || (vd->setcode == NULL && !no_setter))
+ if (vd->getcode != NULL)
+ {
+ prcode(fp,
+" PyObject *sipPy;\n"
+ );
+ }
+ else
{
prcode(fp,
" ");
@@ -3835,328 +3497,368 @@ static void generateVariableHandler(classDef *context, varDef *vd, FILE *fp)
{
if (generating_c)
prcode(fp,
-" %S *sipCpp = (%S *)sipGetCppPtr((sipWrapper *)sipSelf,sipClass_%C);\n"
- ,classFQCName(vd->ecd),classFQCName(vd->ecd),classFQCName(vd->ecd));
+" %S *sipCpp = (%S *)sipSelf;\n"
+ , classFQCName(vd->ecd), classFQCName(vd->ecd));
else
prcode(fp,
-" %S *sipCpp = reinterpret_cast<%S *>(sipGetCppPtr((sipWrapper *)sipSelf,sipClass_%C));\n"
- ,classFQCName(vd->ecd),classFQCName(vd->ecd),classFQCName(vd->ecd));
+" %S *sipCpp = reinterpret_cast<%S *>(sipSelf);\n"
+ , classFQCName(vd->ecd), classFQCName(vd->ecd));
prcode(fp,
"\n"
-" if (!sipCpp)\n"
-" return NULL;\n"
);
}
- prcode(fp,
-"\n"
-" if (sipPy == NULL)\n"
-" {\n"
- );
-
- /* Generate the get handler part. */
-
+ /* Handle any handwritten getter. */
if (vd->getcode != NULL)
{
generateCppCodeBlock(vd->getcode, fp);
prcode(fp,
"\n"
-" return sipPy;\n"
+" return sipPy;\n"
+"}\n"
);
+
+ return;
}
- else
- {
- int pyobj = FALSE, needsNew;
- needsNew = ((atype == class_type || atype == mapped_type) && vd->type.nrderefs == 0);
+ needsNew = ((atype == class_type || atype == mapped_type) && vd->type.nrderefs == 0);
- if (needsNew)
- {
- if (generating_c)
- prcode(fp,
-" *sipVal = ");
- else
- prcode(fp,
-" sipVal = new %b(", &vd->type);
- }
+ if (needsNew)
+ {
+ if (generating_c)
+ prcode(fp,
+" *sipVal = ");
else
prcode(fp,
-" sipVal = ");
+" sipVal = new %b(", &vd->type);
+ }
+ else
+ prcode(fp,
+" sipVal = ");
- generateVarMember(vd, fp);
+ generateVarMember(vd, fp);
- prcode(fp, "%s;\n"
+ prcode(fp, "%s;\n"
"\n"
- , ((needsNew && !generating_c) ? ")" : ""));
+ , ((needsNew && !generating_c) ? ")" : ""));
- switch (atype)
- {
- case mapped_type:
- prcode(fp,
-" sipPy = sipConvertFromMappedType(sipVal,sipMappedType_%T,NULL);\n"
- ,&vd->type);
+ switch (atype)
+ {
+ case mapped_type:
+ prcode(fp,
+" return sipConvertFromType(sipVal, sipType_%T, NULL);\n"
+ , &vd->type);
- break;
+ break;
- case class_type:
- generateVarClassConversion(vd, needsNew, fp);
- break;
+ case class_type:
+ {
+ classDef *cd = vd->type.u.cd;
- case bool_type:
- case cbool_type:
prcode(fp,
-" sipPy = PyBool_FromLong(sipVal);\n"
- );
-
- break;
+" return sipConvertFrom%sType(", (needsNew ? "New" : ""));
- case sstring_type:
- case ustring_type:
- case string_type:
- if (vd->type.nrderefs == 0)
- prcode(fp,
-" sipPy = PyString_FromStringAndSize(%s&sipVal,1);\n"
- ,(atype != string_type) ? "(char *)" : "");
+ if (isConstArg(&vd->type))
+ prcode(fp, "const_cast<%b *>(sipVal)", &vd->type);
else
- prcode(fp,
-" sipPy = PyString_FromString(%ssipVal);\n"
- ,(atype != string_type) ? "(char *)" : "");
+ prcode(fp, "sipVal");
- break;
+ prcode(fp, ",sipType_%C, NULL);\n"
+ , classFQCName(cd));
+ }
- case wstring_type:
- if (vd->type.nrderefs == 0)
- prcode(fp,
-" sipPy = PyUnicode_FromWideChar(&sipVal,1);\n"
- );
- else
- prcode(fp,
-" sipPy = PyUnicode_FromWideChar(sipVal,(SIP_SSIZE_T)wcslen(sipVal));\n"
- );
+ break;
- break;
+ case bool_type:
+ case cbool_type:
+ prcode(fp,
+" return PyBool_FromLong(sipVal);\n"
+ );
- case float_type:
- case cfloat_type:
- prcode(fp,
-" sipPy = PyFloat_FromDouble((double)sipVal);\n"
- );
- break;
+ break;
- case double_type:
- case cdouble_type:
+ case sstring_type:
+ case ustring_type:
+ case string_type:
+ if (vd->type.nrderefs == 0)
prcode(fp,
-" sipPy = PyFloat_FromDouble(sipVal);\n"
- );
- break;
-
- case enum_type:
- if (vd->type.u.ed->fqcname != NULL)
- {
- prcode(fp,
-" sipPy = sipConvertFromNamedEnum(sipVal,sipEnum_%C);\n"
- ,vd->type.u.ed->fqcname);
-
- break;
- }
+" return PyString_FromStringAndSize(%s&sipVal, 1);\n"
+ , (atype != string_type) ? "(char *)" : "");
+ else
+ prcode(fp,
+" return PyString_FromString(%ssipVal);\n"
+ ,(atype != string_type) ? "(char *)" : "");
- /* Drop through. */
+ break;
- case short_type:
- case cint_type:
- case int_type:
+ case wstring_type:
+ if (vd->type.nrderefs == 0)
prcode(fp,
-" sipPy = PyInt_FromLong(sipVal);\n"
+" return PyUnicode_FromWideChar(&sipVal, 1);\n"
);
- break;
-
- case long_type:
+ else
prcode(fp,
-" sipPy = PyLong_FromLong(sipVal);\n"
+" return PyUnicode_FromWideChar(sipVal, (SIP_SSIZE_T)wcslen(sipVal));\n"
);
- break;
- case ushort_type:
- case uint_type:
- case ulong_type:
- prcode(fp,
-" sipPy = PyLong_FromUnsignedLong(sipVal);\n"
- );
- break;
+ break;
- case longlong_type:
- prcode(fp,
-" sipPy = PyLong_FromLongLong(sipVal);\n"
+ case float_type:
+ case cfloat_type:
+ prcode(fp,
+" return PyFloat_FromDouble((double)sipVal);\n"
);
- break;
+ break;
- case ulonglong_type:
- prcode(fp,
-" sipPy = PyLong_FromUnsignedLongLong(sipVal);\n"
- );
- break;
+ case double_type:
+ case cdouble_type:
+ prcode(fp,
+" return PyFloat_FromDouble(sipVal);\n"
+ );
+ break;
- case struct_type:
- case void_type:
+ case enum_type:
+ if (vd->type.u.ed->fqcname != NULL)
+ {
prcode(fp,
-" sipPy = sipConvertFrom%sVoidPtr(sipVal);\n"
- , (isConstArg(&vd->type) ? "Const" : ""));
- break;
+" return sipConvertFromEnum(sipVal, sipType_%C);\n"
+ , vd->type.u.ed->fqcname);
- case pyobject_type:
- case pytuple_type:
- case pylist_type:
- case pydict_type:
- case pycallable_type:
- case pyslice_type:
- case pytype_type:
- prcode(fp,
-" Py_XINCREF(sipVal);\n"
- );
- pyobj = TRUE;
break;
}
+ /* Drop through. */
+
+ case short_type:
+ case cint_type:
+ case int_type:
prcode(fp,
-"\n"
-" return %s;\n"
- ,(pyobj ? "sipVal" : "sipPy"));
+" return PyInt_FromLong(sipVal);\n"
+ );
+ break;
+
+ case long_type:
+ prcode(fp,
+" return PyLong_FromLong(sipVal);\n"
+ );
+ break;
+
+ case ushort_type:
+ case uint_type:
+ case ulong_type:
+ prcode(fp,
+" return PyLong_FromUnsignedLong(sipVal);\n"
+ );
+ break;
+
+ case longlong_type:
+ prcode(fp,
+" return PyLong_FromLongLong(sipVal);\n"
+ );
+ break;
+
+ case ulonglong_type:
+ prcode(fp,
+" return PyLong_FromUnsignedLongLong(sipVal);\n"
+ );
+ break;
+
+ case struct_type:
+ case void_type:
+ prcode(fp,
+" return sipConvertFrom%sVoidPtr(sipVal);\n"
+ , (isConstArg(&vd->type) ? "Const" : ""));
+ break;
+
+ case pyobject_type:
+ case pytuple_type:
+ case pylist_type:
+ case pydict_type:
+ case pycallable_type:
+ case pyslice_type:
+ case pytype_type:
+ prcode(fp,
+" Py_XINCREF(sipVal);\n"
+" return sipVal;\n"
+ );
+ break;
}
prcode(fp,
-" }\n"
+"}\n"
+ );
+}
+
+
+/*
+ * Generate a variable setter.
+ */
+static void generateVariableSetter(classDef *context, varDef *vd, FILE *fp)
+{
+ argType atype = vd->type.atype;
+ const char *first_arg;
+ char *deref;
+ int might_be_temp;
+
+ if (generating_c || !isStaticVar(vd))
+ first_arg = "sipSelf";
+ else
+ first_arg = "";
+
+ prcode(fp,
+"\n"
"\n"
);
- /* Generate the set handler part. */
+ if (!generating_c)
+ prcode(fp,
+"extern \"C\" {static int varset_%C(void *, PyObject *);}\n"
+ , vd->fqcname);
- if (vd->setcode != NULL)
+ prcode(fp,
+"static int varset_%C(void *%s, PyObject *sipPy)\n"
+"{\n"
+ , vd->fqcname, first_arg);
+
+ if (vd->setcode == NULL)
{
prcode(fp,
-" {\n"
-" int sipErr = 0;\n"
-"\n"
+" ");
+
+ generateNamedValueType(context, &vd->type, "sipVal", fp);
+
+ prcode(fp, ";\n"
);
+ }
- generateCppCodeBlock(vd->setcode, fp);
+ if (!isStaticVar(vd))
+ {
+ if (generating_c)
+ prcode(fp,
+" %S *sipCpp = (%S *)sipSelf;\n"
+ , classFQCName(vd->ecd), classFQCName(vd->ecd));
+ else
+ prcode(fp,
+" %S *sipCpp = reinterpret_cast<%S *>(sipSelf);\n"
+ , classFQCName(vd->ecd), classFQCName(vd->ecd));
prcode(fp,
"\n"
-" if (sipErr)\n"
-" return NULL;\n"
-" }\n"
);
}
- else if (no_setter)
+
+ /* Handle any handwritten setter. */
+ if (vd->setcode != NULL)
{
prcode(fp,
-" sipBadSetType(%N,%N);\n"
-" return NULL;\n"
+" int sipErr = 0;\n"
+"\n"
+ );
+
+ generateCppCodeBlock(vd->setcode, fp);
+
+ prcode(fp,
+"\n"
+" return (sipErr ? -1 : 0);\n"
"}\n"
- , vd->ecd->iff->name, vd->pyname);
+ );
return;
}
- else
- {
- char *deref;
- int might_be_temp;
- if (vd->type.nrderefs == 0 && (atype == mapped_type || (atype == class_type && vd->type.u.cd->convtocode != NULL)))
- prcode(fp,
+ if (vd->type.nrderefs == 0 && (atype == mapped_type || (atype == class_type && vd->type.u.cd->convtocode != NULL)))
+ prcode(fp,
" int sipValState;\n"
- );
+ );
- if (atype == class_type || atype == mapped_type)
- prcode(fp,
+ if (atype == class_type || atype == mapped_type)
+ prcode(fp,
" int sipIsErr = 0;\n"
"\n"
- );
+ );
- might_be_temp = generateObjToCppConversion(&vd->type,fp);
+ might_be_temp = generateObjToCppConversion(&vd->type, fp);
- deref = "";
+ deref = "";
- if (atype == class_type || atype == mapped_type)
- {
- if (vd->type.nrderefs == 0)
- deref = "*";
+ if (atype == class_type || atype == mapped_type)
+ {
+ if (vd->type.nrderefs == 0)
+ deref = "*";
- prcode(fp,
+ prcode(fp,
"\n"
" if (sipIsErr)\n"
-" return NULL;\n"
+" return -1;\n"
"\n"
- );
- }
- else
+ );
+ }
+ else
+ {
+ if ((atype == sstring_type || atype == ustring_type || atype == string_type || atype == wstring_type) && vd->type.nrderefs != 0)
{
- if ((atype == sstring_type || atype == ustring_type || atype == string_type || atype == wstring_type) && vd->type.nrderefs != 0)
- {
- prcode(fp,
+ prcode(fp,
"\n"
" if (sipVal == NULL)\n"
- );
- }
- else
- prcode(fp,
+ );
+ }
+ else
+ prcode(fp,
"\n"
" if (PyErr_Occurred() != NULL)\n"
- );
+ );
- prcode(fp,
+ prcode(fp,
" {\n"
-" sipBadSetType(%N,%N);\n"
-" return NULL;\n"
+" sipBadSetType(%N, %N);\n"
+" return -1;\n"
" }\n"
"\n"
- ,vd->ecd->iff->name,vd->pyname);
- }
+ , vd->ecd->pyname, vd->pyname);
+ }
- if (atype == pyobject_type || atype == pytuple_type ||
- atype == pylist_type || atype == pydict_type ||
- atype == pycallable_type || atype == pyslice_type ||
- atype == pytype_type)
- {
- prcode(fp,
+ if (atype == pyobject_type || atype == pytuple_type ||
+ atype == pylist_type || atype == pydict_type ||
+ atype == pycallable_type || atype == pyslice_type ||
+ atype == pytype_type)
+ {
+ prcode(fp,
" Py_XDECREF(");
- generateVarMember(vd, fp);
+ generateVarMember(vd, fp);
- prcode(fp, ");\n"
+ prcode(fp, ");\n"
" Py_INCREF(sipVal);\n"
"\n"
- );
- }
+ );
+ }
- prcode(fp,
+ prcode(fp,
" ");
- generateVarMember(vd, fp);
+ generateVarMember(vd, fp);
- prcode(fp, " = %ssipVal;\n"
- , deref);
+ prcode(fp, " = %ssipVal;\n"
+ , deref);
- /* Note that wchar_t * leaks here. */
+ /* Note that wchar_t * leaks here. */
- if (might_be_temp)
- prcode(fp,
+ if (might_be_temp)
+ prcode(fp,
"\n"
-" sipReleaseInstance(sipVal,sipClass_%C,sipValState);\n"
- , classFQCName(vd->type.u.cd));
- else if (vd->type.atype == mapped_type && vd->type.nrderefs == 0 && !noRelease(vd->type.u.mtd))
- prcode(fp,
+" sipReleaseType(sipVal, sipType_%C, sipValState);\n"
+ , classFQCName(vd->type.u.cd));
+ else if (vd->type.atype == mapped_type && vd->type.nrderefs == 0 && !noRelease(vd->type.u.mtd))
+ prcode(fp,
"\n"
-" sipReleaseMappedType(sipVal,sipMappedType_%T,sipValState);\n"
- , &vd->type);
- }
+" sipReleaseType(sipVal, sipType_%T, sipValState);\n"
+ , &vd->type);
prcode(fp,
"\n"
-" Py_INCREF(Py_None);\n"
-" return Py_None;\n"
+" return 0;\n"
"}\n"
);
}
@@ -4177,26 +3879,6 @@ static void generateVarMember(varDef *vd, FILE *fp)
/*
- * Generate an variable class conversion fragment.
- */
-static void generateVarClassConversion(varDef *vd, int is_new, FILE *fp)
-{
- classDef *cd = vd->type.u.cd;
-
- prcode(fp,
-" sipPy = sipConvertFrom%sInstance(", (is_new ? "New" : ""));
-
- if (isConstArg(&vd->type))
- prcode(fp,"const_cast<%b *>(sipVal)",&vd->type);
- else
- prcode(fp,"sipVal");
-
- prcode(fp,",sipClass_%C,NULL);\n"
- ,classFQCName(cd));
-}
-
-
-/*
* Generate the declaration of a variable that is initialised from a Python
* object. Return TRUE if the value might be a temporary on the heap.
*/
@@ -4227,7 +3909,7 @@ static int generateObjToCppConversion(argDef *ad,FILE *fp)
/* Note that we don't support /Transfer/ but could do. */
- prcode(fp, "sipForceConvertToMappedType(sipPy,sipMappedType_%T,NULL,%s,%s,&sipIsErr)", ad, (ad->nrderefs ? "0" : "SIP_NOT_NONE"), (ad->nrderefs ? "NULL" : "&sipValState"));
+ prcode(fp, "sipForceConvertToType(sipPy,sipType_%T,NULL,%s,%s,&sipIsErr)", ad, (ad->nrderefs ? "0" : "SIP_NOT_NONE"), (ad->nrderefs ? "NULL" : "&sipValState"));
prcode(fp, "%s;\n"
, tail);
@@ -4258,7 +3940,7 @@ static int generateObjToCppConversion(argDef *ad,FILE *fp)
* all types).
*/
- prcode(fp, "sipForceConvertToInstance(sipPy,sipClass_%C,NULL,%s,%s,&sipIsErr)", classFQCName(ad->u.cd), (ad->nrderefs ? "0" : "SIP_NOT_NONE"), (might_be_temp ? "&sipValState" : "NULL"));
+ prcode(fp, "sipForceConvertToType(sipPy,sipType_%C,NULL,%s,%s,&sipIsErr)", classFQCName(ad->u.cd), (ad->nrderefs ? "0" : "SIP_NOT_NONE"), (might_be_temp ? "&sipValState" : "NULL"));
prcode(fp, "%s;\n"
, tail);
@@ -4519,7 +4201,7 @@ static void generateSlot(moduleDef *mod, classDef *cd, enumDef *ed,
else if (cd != NULL)
{
prefix = "Class";
- pyname = cd->iff->name;
+ pyname = cd->pyname;
fqcname = classFQCName(cd);
overs = cd->overs;
}
@@ -4613,7 +4295,7 @@ static void generateSlot(moduleDef *mod, classDef *cd, enumDef *ed,
{
if (cd != NULL)
prcode(fp,
-" %S *sipCpp = reinterpret_cast<%S *>(sipGetCppPtr((sipWrapper *)sipSelf,sipClass_%C));\n"
+" %S *sipCpp = reinterpret_cast<%S *>(sipGetCppPtr((sipSimpleWrapper *)sipSelf,sipType_%C));\n"
"\n"
" if (!sipCpp)\n"
" return %s;\n"
@@ -4633,16 +4315,6 @@ static void generateSlot(moduleDef *mod, classDef *cd, enumDef *ed,
);
for (od = overs; od != NULL; od = od->next)
- if (od->common == md && isAbstract(od))
- {
- prcode(fp,
-" bool sipSelfWasArg = !sipSelf;\n"
- );
-
- break;
- }
-
- for (od = overs; od != NULL; od = od->next)
if (od->common == md)
generateFunctionBody(od, cd, cd, (ed == NULL && !dontDerefSelf(od)), fp);
@@ -4687,8 +4359,8 @@ static void generateSlot(moduleDef *mod, classDef *cd, enumDef *ed,
else
prcode(fp,
"\n"
-" return sipPySlotExtend(&sipModuleAPI_%s,%s,sip%s_%C,sipSelf,sipArg);\n"
- , mod->name, slotName(md->slot), prefix, fqcname);
+" return sipPySlotExtend(&sipModuleAPI_%s,%s,sipType_%C,sipSelf,sipArg);\n"
+ , mod->name, slotName(md->slot), fqcname);
}
else if (isInplaceNumberSlot(md))
prcode(fp,
@@ -4757,11 +4429,11 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd,
if (!generating_c)
prcode(fp,
-"extern \"C\" {static void *cast_%C(void *, sipWrapperType *);}\n"
+"extern \"C\" {static void *cast_%C(void *, const sipTypeDef *);}\n"
, classFQCName(cd));
prcode(fp,
-"static void *cast_%C(void *ptr,sipWrapperType *targetClass)\n"
+"static void *cast_%C(void *ptr,const sipTypeDef *targetType)\n"
"{\n"
,classFQCName(cd));
@@ -4772,7 +4444,7 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd,
);
prcode(fp,
-" if (targetClass == sipClass_%C)\n"
+" if (targetType == sipType_%C)\n"
" return ptr;\n"
,classFQCName(cd));
@@ -4782,7 +4454,7 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd,
prcode(fp,
"\n"
-" if ((res = sipCast_%C((%S *)(%S *)ptr,targetClass)) != NULL)\n"
+" if ((res = ((const sipClassTypeDef *)sipType_%C)->ctd_cast((%S *)(%S *)ptr,targetType)) != NULL)\n"
" return res;\n"
,sname,sname,classFQCName(cd));
}
@@ -5130,35 +4802,19 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd,
}
/* The assignment helper. */
- if (optAssignmentHelpers(pt) && (generating_c || canAssign(cd)))
+ if (pluginPyQt4(pt) && assignmentHelper(cd))
{
prcode(fp,
"\n"
"\n"
- );
-
- if (!generating_c)
- prcode(fp,
"extern \"C\" {static void assign_%C(void *, const void*);}\n"
- , classFQCName(cd));
-
- prcode(fp,
"static void assign_%C(void *sipDst, const void *sipSrc)\n"
"{\n"
- ,classFQCName(cd));
-
- if (generating_c)
- prcode(fp,
-" *(%S *)sipDst = *(const %S *)sipSrc;\n"
- , classFQCName(cd), classFQCName(cd));
- else
- prcode(fp,
" *reinterpret_cast<%S *>(sipDst) = *reinterpret_cast<const %S *>(sipSrc);\n"
- , classFQCName(cd), classFQCName(cd));
-
- prcode(fp,
"}\n"
- );
+ , classFQCName(cd)
+ , classFQCName(cd)
+ , classFQCName(cd), classFQCName(cd));
}
/* The dealloc function. */
@@ -5171,11 +4827,11 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd,
if (!generating_c)
prcode(fp,
-"extern \"C\" {static void dealloc_%C(sipWrapper *);}\n"
+"extern \"C\" {static void dealloc_%C(sipSimpleWrapper *);}\n"
, classFQCName(cd));
prcode(fp,
-"static void dealloc_%C(sipWrapper *sipSelf)\n"
+"static void dealloc_%C(sipSimpleWrapper *sipSelf)\n"
"{\n"
,classFQCName(cd));
@@ -5325,14 +4981,14 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd,
}
/* The meta methods if required. */
- if (isQObjectSubClass(cd) && optQ_OBJECT4(pt))
+ if (pluginPyQt4(pt) && isQObjectSubClass(cd))
{
- if (!noQMetaObject(cd))
+ if (!noPyQt4QMetaObject(cd))
prcode(fp,
"\n"
"const QMetaObject *sip%C::metaObject() const\n"
"{\n"
-" return sip_%s_qt_metaobject(sipPySelf,sipClass_%C,0);\n"
+" return sip_%s_qt_metaobject(sipPySelf,sipType_%C);\n"
"}\n"
, classFQCName(cd)
, mod->name, classFQCName(cd));
@@ -5341,28 +4997,20 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd,
"\n"
"int sip%C::qt_metacall(QMetaObject::Call _c,int _id,void **_a)\n"
"{\n"
- , classFQCName(cd));
-
- if (!noQMetaObject(cd))
- prcode(fp,
-" sip%C::metaObject();\n"
-"\n"
- , classFQCName(cd));
-
- prcode(fp,
" _id = %S::qt_metacall(_c,_id,_a);\n"
"\n"
" if (_id >= 0)\n"
-" _id = sip_%s_qt_metacall(sipPySelf,sipClass_%C,_c,_id,_a);\n"
+" _id = sip_%s_qt_metacall(sipPySelf,sipType_%C,_c,_id,_a);\n"
"\n"
" return _id;\n"
"}\n"
"\n"
"void *sip%C::qt_metacast(const char *_clname)\n"
"{\n"
-" return (sip_%s_qt_metacast && sip_%s_qt_metacast(sipPySelf,sipClass_%C,_clname)) ? this : %S::qt_metacast(_clname);\n"
+" return (sip_%s_qt_metacast && sip_%s_qt_metacast(sipPySelf,sipType_%C,_clname)) ? this : %S::qt_metacast(_clname);\n"
"}\n"
, classFQCName(cd)
+ , classFQCName(cd)
, mod->name, classFQCName(cd)
, classFQCName(cd)
, mod->name, mod->name, classFQCName(cd), classFQCName(cd));
@@ -5396,7 +5044,7 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd,
generateProtectedDefinitions(cd,fp);
/* Generate the emitters if needed. */
- if (!optNoEmitters(pt))
+ if (pluginPyQt3(pt))
generateEmitters(cd, fp);
}
@@ -5438,7 +5086,7 @@ static void generateEmitters(classDef *cd, FILE *fp)
prcode(fp,
"\n"
-"static sipQtSignal signals_%C[] = {\n"
+"static pyqt3QtSignal signals_%C[] = {\n"
,classFQCName(cd));
noIntro = FALSE;
@@ -5533,7 +5181,7 @@ static void generateVirtualCatcher(moduleDef *mod, classDef *cd, int virtNr,
prcode(fp,
"\n");
- generateBaseType(cd, &od->cppsig->result, fp);
+ generateBaseType(cd, &od->cppsig->result, TRUE, fp);
prcode(fp," sip%C::%O(",classFQCName(cd),od);
generateCalledArgs(cd, od->cppsig, Definition, TRUE, fp);
@@ -5546,7 +5194,7 @@ static void generateVirtualCatcher(moduleDef *mod, classDef *cd, int virtNr,
prcode(fp,
" sipTrace(SIP_TRACE_CATCHERS,\"");
- generateBaseType(cd, &od->cppsig->result, fp);
+ generateBaseType(cd, &od->cppsig->result, TRUE, fp);
prcode(fp," sip%C::%O(",classFQCName(cd),od);
generateCalledArgs(cd, od->cppsig, Declaration, TRUE, fp);
prcode(fp,")%s%X (this=0x%%08x)\\n\",this);\n"
@@ -5564,7 +5212,7 @@ static void generateVirtualCatcher(moduleDef *mod, classDef *cd, int virtNr,
prcode(fp,
" extern ");
- generateBaseType(cd, &od->cppsig->result, fp);
+ generateBaseType(cd, &od->cppsig->result, FALSE, fp);
prcode(fp," sipVH_%s_%d(sip_gilstate_t,PyObject *",vhd->module->name,vhd->virthandlernr);
}
@@ -5573,7 +5221,7 @@ static void generateVirtualCatcher(moduleDef *mod, classDef *cd, int virtNr,
prcode(fp,
" typedef ");
- generateBaseType(cd, &od->cppsig->result, fp);
+ generateBaseType(cd, &od->cppsig->result, FALSE, fp);
prcode(fp," (*sipVH_%s_%d)(sip_gilstate_t,PyObject *",vhd->module->name,vhd->virthandlernr);
}
@@ -5613,7 +5261,7 @@ static void generateVirtualCatcher(moduleDef *mod, classDef *cd, int virtNr,
prcode(fp,",sipPySelf,");
if (isAbstract(od))
- prcode(fp,"%N",cd->iff->name);
+ prcode(fp, "%N", cd->pyname);
else
prcode(fp,"NULL");
@@ -5970,17 +5618,17 @@ static void generateEmitter(classDef *cd, visibleList *vl, FILE *fp)
" return -1;\n"
"}\n"
"\n"
- , cd->iff->name, vl->m->pyname);
+ , cd->pyname, vl->m->pyname);
if (!generating_c)
prcode(fp,
-"extern \"C\" {static int %C_emit_%s(sipWrapper *, PyObject *);}\n"
+"extern \"C\" {static int %C_emit_%s(sipSimpleWrapper *, PyObject *);}\n"
, classFQCName(cd), pname);
prcode(fp,
-"static int %C_emit_%s(sipWrapper *w,PyObject *sipArgs)\n"
+"static int %C_emit_%s(sipSimpleWrapper *sw,PyObject *sipArgs)\n"
"{\n"
-" sip%C *ptr = reinterpret_cast<sip%C *>(sipGetComplexCppPtr(w));\n"
+" sip%C *ptr = reinterpret_cast<sip%C *>(sipGetComplexCppPtr(sw));\n"
"\n"
" return (ptr ? ptr->sipEmit_%s(sipArgs) : -1);\n"
"}\n"
@@ -6032,17 +5680,9 @@ static void generateProtectedDeclarations(classDef *cd,FILE *fp)
if (isStatic(od))
prcode(fp,"static ");
- generateBaseType(cd, &od->cppsig->result, fp);
+ generateBaseType(cd, &od->cppsig->result, TRUE, fp);
- if (!isStatic(od) && !isAbstract(od) && (isVirtual(od) || isVirtualReimp(od)))
- {
- prcode(fp, " sipProtectVirt_%s(bool", od->cppname);
-
- if (od->cppsig->nrArgs > 0)
- prcode(fp, ",");
- }
- else
- prcode(fp, " sipProtect_%s(", od->cppname);
+ prcode(fp, " sipProtect_%s(", od->cppname);
generateCalledArgs(cd, od->cppsig, Declaration, TRUE, fp);
prcode(fp,")%s;\n"
@@ -6079,17 +5719,9 @@ static void generateProtectedDefinitions(classDef *cd,FILE *fp)
"\n"
);
- generateBaseType(cd, &od->cppsig->result, fp);
-
- if (!isStatic(od) && !isAbstract(od) && (isVirtual(od) || isVirtualReimp(od)))
- {
- prcode(fp, " sip%C::sipProtectVirt_%s(bool sipSelfWasArg", classFQCName(cd), mname);
+ generateBaseType(cd, &od->cppsig->result, TRUE, fp);
- if (od->cppsig->nrArgs > 0)
- prcode(fp, ",");
- }
- else
- prcode(fp, " sip%C::sipProtect_%s(", classFQCName(cd), mname);
+ prcode(fp, " sip%C::sipProtect_%s(", classFQCName(cd), mname);
generateCalledArgs(cd, od->cppsig, Definition, TRUE, fp);
prcode(fp,")%s\n"
@@ -6122,19 +5754,7 @@ static void generateProtectedDefinitions(classDef *cd,FILE *fp)
}
if (!isAbstract(od))
- {
- if (isVirtual(od) || isVirtualReimp(od))
- {
- prcode(fp, "(sipSelfWasArg ? %S::%s(", classFQCName(vl->cd), mname);
-
- generateProtectedCallArgs(od, fp);
-
- prcode(fp, ") : ");
- ++parens;
- }
- else
- prcode(fp, "%S::", classFQCName(vl->cd));
- }
+ prcode(fp, "%S::", classFQCName(vl->cd));
prcode(fp,"%s(",mname);
@@ -6218,7 +5838,7 @@ static void generateVirtualHandler(virtHandlerDef *vhd, FILE *fp)
saved = *vhd->cppsig;
fakeProtectedArgs(vhd->cppsig);
- generateBaseType(NULL, &vhd->cppsig->result, fp);
+ generateBaseType(NULL, &vhd->cppsig->result, FALSE, fp);
prcode(fp," sipVH_%s_%d(sip_gilstate_t sipGILState,PyObject *sipMethod"
, vhd->module->name, vhd->virthandlernr);
@@ -6250,7 +5870,7 @@ static void generateVirtualHandler(virtHandlerDef *vhd, FILE *fp)
if (res->atype == wstring_type && res->nrderefs == 1)
prcode(fp, "static ");
- generateBaseType(NULL, &res_noconstref, fp);
+ generateBaseType(NULL, &res_noconstref, FALSE, fp);
prcode(fp," %ssipRes",(isref ? "*" : ""));
@@ -6341,7 +5961,7 @@ static void generateVirtualHandler(virtHandlerDef *vhd, FILE *fp)
prcode(fp,
" ");
- generateBaseType(NULL, &res_noconstref, fp);
+ generateBaseType(NULL, &res_noconstref, FALSE, fp);
prcode(fp," *sipResOrig;\n");
@@ -6435,7 +6055,7 @@ static void generateVirtualHandler(virtHandlerDef *vhd, FILE *fp)
);
else if (res->atype == class_type && res->u.cd->convtocode != NULL)
prcode(fp,
-" sipReleaseInstance(sipResOrig,sipClass_%C,sipResState);\n"
+" sipReleaseType(sipResOrig,sipType_%C,sipResState);\n"
, classFQCName(res->u.cd));
prcode(fp,
@@ -6484,11 +6104,11 @@ static void generateParseResultExtraArgs(argDef *ad, int isres, FILE *fp)
switch (ad->atype)
{
case mapped_type:
- prcode(fp, ",sipMappedType_%T", ad);
+ prcode(fp, ",sipType_%T", ad);
break;
case class_type:
- prcode(fp, ",sipClass_%C", classFQCName(ad->u.cd));
+ prcode(fp, ",sipType_%C", classFQCName(ad->u.cd));
if (isres && ad->nrderefs == 0 && ad->u.cd->convtocode != NULL && !isReference(ad))
prcode(fp, ",&sipResState");
@@ -6517,7 +6137,7 @@ static void generateParseResultExtraArgs(argDef *ad, int isres, FILE *fp)
case enum_type:
if (ad->u.ed->fqcname != NULL)
- prcode(fp,",sipEnum_%C",ad->u.ed->fqcname);
+ prcode(fp, ",sipType_%C", ad->u.ed->fqcname);
break;
}
}
@@ -6551,7 +6171,7 @@ static const char *getParseResultFormat(argDef *ad, int isres, int xfervh)
case fake_void_type:
case class_type:
{
- static char s[] = "C?";
+ static char s[] = "D?";
int f = 0x04;
@@ -6595,7 +6215,7 @@ static const char *getParseResultFormat(argDef *ad, int isres, int xfervh)
return ((ad->nrderefs == 0) ? "w" : "x");
case enum_type:
- return ((ad->u.ed->fqcname != NULL) ? "E" : "e");
+ return ((ad->u.ed->fqcname != NULL) ? "F" : "e");
case ushort_type:
return "t";
@@ -6697,7 +6317,7 @@ static void generateTupleBuilder(signatureDef *sd,FILE *fp)
break;
case enum_type:
- fmt = (ad->u.ed->fqcname != NULL) ? "E" : "e";
+ fmt = (ad->u.ed->fqcname != NULL) ? "F" : "e";
break;
case cint_type:
@@ -6791,18 +6411,12 @@ static void generateTupleBuilder(signatureDef *sd,FILE *fp)
break;
case mapped_type:
- fmt = "D";
- break;
-
case fake_void_type:
case class_type:
- fmt = "C";
- break;
-
case rxcon_type:
case rxdis_type:
case qobject_type:
- fmt = "O";
+ fmt = "D";
break;
case pyobject_type:
@@ -6877,28 +6491,28 @@ static void generateTupleBuilder(signatureDef *sd,FILE *fp)
prcode(fp,")");
if (ad->atype == mapped_type)
- prcode(fp, ",sipMappedType_%T,NULL", ad);
+ prcode(fp, ",sipType_%T,NULL", ad);
else if (ad->atype == fake_void_type || ad->atype == class_type)
- prcode(fp, ",sipClass_%C,NULL", classFQCName(ad->u.cd));
+ prcode(fp, ",sipType_%C,NULL", classFQCName(ad->u.cd));
else
- prcode(fp,",sipClass_QObject");
+ prcode(fp,",sipType_QObject,NULL");
}
else
{
if (!isArraySize(ad))
{
- prcode(fp,",");
+ prcode(fp, ",");
while (derefs-- != 0)
- prcode(fp,"*");
+ prcode(fp, "*");
- prcode(fp,"a%d",a);
+ prcode(fp, "a%d", a);
}
if (isArray(ad))
prcode(fp, ",(SIP_SSIZE_T)a%d", arraylenarg);
else if (ad->atype == enum_type && ad->u.ed->fqcname != NULL)
- prcode(fp,",sipEnum_%C",ad->u.ed->fqcname);
+ prcode(fp, ",sipType_%C", ad->u.ed->fqcname);
}
}
}
@@ -6937,7 +6551,7 @@ static void generateModuleAPI(sipSpec *pt, moduleDef *mod, FILE *fp)
for (mtd = pt->mappedtypes; mtd != NULL; mtd = mtd->next)
if (mtd->iff->module == mod)
- generateMappedTypeAPI(mtd, fp);
+ generateMappedTypeAPI(pt, mtd, fp);
for (xd = pt->exceptions; xd != NULL; xd = xd->next)
if (xd->iff->module == mod && xd->exceptionnr >= 0)
@@ -6992,11 +6606,7 @@ static void generateImportedMappedTypeAPI(mappedTypeDef *mtd, moduleDef *mod,
prcode(fp,
"\n"
-"#define sipMappedType_%T sipModuleAPI_%s_%s->em_mappedtypes[%d]\n"
-"#define sipForceConvertTo_%T sipModuleAPI_%s_%s->em_mappedtypes[%d]->mt_fcto\n"
-"#define sipConvertFrom_%T sipModuleAPI_%s_%s->em_mappedtypes[%d]->mt_cfrom\n"
- , &type, mname, imname, mtd->mappednr
- , &type, mname, imname, mtd->mappednr
+"#define sipType_%T sipModuleAPI_%s_%s->em_types[%d]\n"
, &type, mname, imname, mtd->mappednr);
}
@@ -7004,19 +6614,22 @@ static void generateImportedMappedTypeAPI(mappedTypeDef *mtd, moduleDef *mod,
/*
* Generate the API details for a mapped type.
*/
-static void generateMappedTypeAPI(mappedTypeDef *mtd, FILE *fp)
+static void generateMappedTypeAPI(sipSpec *pt, mappedTypeDef *mtd, FILE *fp)
{
+ const char *type_prefix;
+
+ if (pluginPyQt4(pt))
+ type_prefix = "pyqt4";
+ else
+ type_prefix = "sip";
+
prcode(fp,
"\n"
-"#define sipMappedType_%T &sipMappedTypeDef_%T\n"
-"#define sipForceConvertTo_%T sipMappedTypeDef_%T.mt_fcto\n"
-"#define sipConvertFrom_%T sipMappedTypeDef_%T.mt_cfrom\n"
+"#define sipType_%T sipModuleAPI_%s.em_types[%d]\n"
"\n"
-"extern sipMappedType sipMappedTypeDef_%T;\n"
- , &mtd->type, &mtd->type
- , &mtd->type, &mtd->type
- , &mtd->type, &mtd->type
- , &mtd->type);
+"extern %sMappedTypeDef %sMappedTypeDef_%T;\n"
+ , &mtd->type, mtd->iff->module->name, mtd->mappednr
+ , type_prefix, type_prefix, &mtd->type);
}
@@ -7029,23 +6642,25 @@ static void generateImportedClassAPI(classDef *cd, sipSpec *pt, moduleDef *mod,
const char *mname = mod->name;
const char *imname = cd->iff->module->name;
+ prcode(fp,
+"\n"
+ );
+
if (cd->iff->type == namespace_iface)
prcode(fp,
-"\n"
-"#if !defined(sipClass_%C)\n"
-"#define sipClass_%C sipModuleAPI_%s_%s->em_types[%d]\n"
-"#endif\n"
- , classFQCName(cd)
- , classFQCName(cd), mname, imname, cd->classnr);
- else
+"#if !defined(sipType_%C)\n"
+ , classFQCName(cd));
+
+ prcode(fp,
+"#define sipType_%C sipModuleAPI_%s_%s->em_types[%d]\n"
+"#define sipClass_%C sipModuleAPI_%s_%s->em_types[%d]->u.td_wrapper_type\n"
+ , classFQCName(cd), mname, imname, cd->classnr
+ , classFQCName(cd), mname, imname, cd->classnr);
+
+ if (cd->iff->type == namespace_iface)
prcode(fp,
-"\n"
-"#define sipClass_%C sipModuleAPI_%s_%s->em_types[%d]\n"
-"#define sipCast_%C sipModuleAPI_%s_%s->em_types[%d]->type->td_cast\n"
-"#define sipForceConvertTo_%C sipModuleAPI_%s_%s->em_types[%d]->type->td_fcto\n"
- , classFQCName(cd), mname, imname, cd->classnr
- , classFQCName(cd), mname, imname, cd->classnr
- , classFQCName(cd), mname, imname, cd->classnr);
+"#endif\n"
+ );
generateEnumMacros(pt, mod, cd, fp);
}
@@ -7064,23 +6679,29 @@ static void generateClassAPI(classDef *cd, sipSpec *pt, FILE *fp)
if (cd->real == NULL)
prcode(fp,
-"#define sipClass_%C sipModuleAPI_%s.em_types[%d]\n"
+"#define sipType_%C sipModuleAPI_%s.em_types[%d]\n"
+"#define sipClass_%C sipModuleAPI_%s.em_types[%d]->u.td_wrapper_type\n"
+ , classFQCName(cd), mname, cd->classnr
, classFQCName(cd), mname, cd->classnr);
- if (cd->iff->type != namespace_iface && !isExternal(cd))
- prcode(fp,
-"#define sipCast_%C sipType_%s_%C.td_cast\n"
-"#define sipForceConvertTo_%C sipType_%s_%C.td_fcto\n"
- , classFQCName(cd), mname, classFQCName(cd)
- , classFQCName(cd), mname, classFQCName(cd));
-
generateEnumMacros(pt, cd->iff->module, cd, fp);
if (!isExternal(cd))
+ {
+ const char *type_prefix;
+
+ if (pluginPyQt4(pt))
+ type_prefix = "pyqt4";
+ else if (pluginPyQt3(pt))
+ type_prefix = "pyqt3";
+ else
+ type_prefix = "sip";
+
prcode(fp,
"\n"
-"extern sipTypeDef sipType_%s_%C;\n"
- , mname, classFQCName(cd));
+"extern %sClassTypeDef %sType_%s_%C;\n"
+ , type_prefix, type_prefix, mname, classFQCName(cd));
+ }
}
@@ -7107,16 +6728,18 @@ static void generateEnumMacros(sipSpec *pt, moduleDef *mod, classDef *cd,
noIntro = FALSE;
}
- prcode(fp,
-"#define sipEnum_%C sipModuleAPI_%s", ed->fqcname, mod->name);
-
if (mod == ed->module)
- prcode(fp, ".");
+ prcode(fp,
+"#define sipType_%C sipModuleAPI_%s.em_types[%d]\n"
+"#define sipEnum_%C sipModuleAPI_%s.em_types[%d]->u.td_py_type\n"
+ , ed->fqcname, mod->name, ed->enumnr
+ , ed->fqcname, mod->name, ed->enumnr);
else
- prcode(fp, "_%s->", ed->module->name);
-
- prcode(fp, "em_enums[%d]\n"
- , ed->enumnr);
+ prcode(fp,
+"#define sipType_%C sipModuleAPI_%s_%s->em_types[%d]\n"
+"#define sipEnum_%C sipModuleAPI_%s_%s->em_types[%d]->u.td_py_type\n"
+ , ed->fqcname, mod->name, ed->module->name, ed->enumnr
+ , ed->fqcname, mod->name, ed->module->name, ed->enumnr);
}
}
@@ -7206,7 +6829,7 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp)
,(cd->vmembers != NULL ? "virtual " : ""),classFQCName(cd),cd->dtorexceptions);
/* The metacall methods if required. */
- if (isQObjectSubClass(cd) && optQ_OBJECT4(pt))
+ if (pluginPyQt4(pt) && isQObjectSubClass(cd))
{
prcode(fp,
"\n"
@@ -7214,7 +6837,7 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp)
" void *qt_metacast(const char *);\n"
);
- if (!noQMetaObject(cd))
+ if (!noPyQt4QMetaObject(cd))
prcode(fp,
" const QMetaObject *metaObject() const;\n"
);
@@ -7229,7 +6852,7 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp)
generateProtectedDeclarations(cd,fp);
/* The public wrapper around each signal emitter. */
- if (!optNoEmitters(pt))
+ if (pluginPyQt3(pt))
{
visibleList *vl;
@@ -7313,7 +6936,7 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp)
prcode(fp,
"\n"
"public:\n"
-" sipWrapper *sipPySelf;\n"
+" sipSimpleWrapper *sipPySelf;\n"
);
/* The private declarations. */
@@ -7347,7 +6970,7 @@ void prOverloadDecl(FILE *fp, classDef *context, overDef *od, int defval)
normaliseArgs(od->cppsig);
- generateBaseType(context, &od->cppsig->result, fp);
+ generateBaseType(context, &od->cppsig->result, TRUE, fp);
prcode(fp, " %O(", od);
@@ -7358,7 +6981,7 @@ void prOverloadDecl(FILE *fp, classDef *context, overDef *od, int defval)
if (a > 0)
prcode(fp, ",");
- generateBaseType(context, ad, fp);
+ generateBaseType(context, ad, TRUE, fp);
if (defval && ad->defval != NULL)
{
@@ -7507,9 +7130,10 @@ static void generateNamedValueType(classDef *context, argDef *ad, char *name,
/*
* Generate a C++ type.
*/
-static void generateBaseType(classDef *context, argDef *ad, FILE *fp)
+static void generateBaseType(classDef *context, argDef *ad, int use_typename,
+ FILE *fp)
{
- generateNamedBaseType(context, ad, "", TRUE, fp);
+ generateNamedBaseType(context, ad, "", use_typename, fp);
}
@@ -7546,7 +7170,7 @@ static void generateNamedBaseType(classDef *context, argDef *ad, char *name,
int i;
signatureDef *sig = ad->u.sa;
- generateBaseType(context, &sig->result, fp);
+ generateBaseType(context, &sig->result, TRUE, fp);
prcode(fp," (");
@@ -7666,7 +7290,7 @@ static void generateNamedBaseType(classDef *context, argDef *ad, char *name,
break;
case mapped_type:
- generateBaseType(context, &ad->u.mtd->type, fp);
+ generateBaseType(context, &ad->u.mtd->type, TRUE, fp);
break;
case class_type:
@@ -7686,7 +7310,7 @@ static void generateNamedBaseType(classDef *context, argDef *ad, char *name,
if (a > 0)
prcode(fp, ",");
- generateBaseType(context, &td->types.args[a], fp);
+ generateBaseType(context, &td->types.args[a], TRUE, fp);
}
if (prcode_last == tail)
@@ -7894,15 +7518,15 @@ static void generateSimpleFunctionCall(fcallDef *fcd,FILE *fp)
/*
* Generate the type structure that contains all the information needed by the
- * metatype. A sub-set of this is used to extend namespaces.
+ * meta-type. A sub-set of this is used to extend namespaces.
*/
static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
{
- const char *mname, *sep;
- int is_slots, nr_methods, nr_enums;
+ const char *mname, *sep, *type_prefix;
+ int is_slots, is_signals, nr_methods, nr_enums, nr_vars, embedded;
int is_inst_class, is_inst_voidp, is_inst_char, is_inst_string;
int is_inst_int, is_inst_long, is_inst_ulong, is_inst_longlong;
- int is_inst_ulonglong, is_inst_double, is_inst_enum;
+ int is_inst_ulonglong, is_inst_double;
memberDef *md;
moduleDef *mod;
@@ -7965,10 +7589,105 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
"};\n"
);
+ /* Generate the PyQt4 signals table. */
+ is_signals = FALSE;
+
+ if (pluginPyQt4(pt) && isQObjectSubClass(cd))
+ {
+ /* The signals must be grouped by name. */
+ for (md = cd->members; md != NULL; md = md->next)
+ {
+ overDef *od;
+
+ for (od = cd->overs; od != NULL; od = od->next)
+ {
+ int a, nr_args;
+
+ if (od->common != md || !isSignal(od))
+ continue;
+
+ if (!is_signals)
+ {
+ is_signals = TRUE;
+
+ prcode(fp,
+"\n"
+"\n"
+"/* Define this type's PyQt4 signals. */\n"
+"static const char *pyqt4_signals_%C[] = {\n"
+ , classFQCName(cd));
+ }
+
+ /* Default arguments are handled as multiple signals. */
+ nr_args = od->cppsig->nrArgs;
+
+ for (a = 0; a < nr_args; ++a)
+ if (od->cppsig->args[a].defval != NULL)
+ {
+ od->cppsig->nrArgs = a;
+ generateSignalTableEntry(cd, od, fp);
+ }
+
+ od->cppsig->nrArgs = nr_args;
+ generateSignalTableEntry(cd, od, fp);
+ }
+ }
+
+ if (is_signals)
+ prcode(fp,
+" 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;
+
+ if (hasVarHandlers(cd))
+ {
+ varDef *vd;
+
+ for (vd = pt->vars; vd != NULL; vd = vd->next)
+ if (vd->ecd == cd && needsHandler(vd))
+ {
+ ++nr_vars;
+
+ generateVariableGetter(cd, vd, fp);
+
+ if (canSetVariable(vd))
+ generateVariableSetter(cd, vd, fp);
+ }
+
+ /* Generate the variable table. */
+ prcode(fp,
+"\n"
+"sipVariableDef variables_%C[] = {\n"
+ ,classFQCName(cd));
+
+ for (vd = pt->vars; vd != NULL; vd = vd->next)
+ if (vd->ecd == cd && needsHandler(vd))
+ {
+ prcode(fp,
+" {%N, varget_%C, ", vd->pyname, vd->fqcname);
+
+ if (canSetVariable(vd))
+ prcode(fp, "varset_%C", vd->fqcname);
+ else
+ prcode(fp, "NULL");
+
+ prcode(fp, ", %d},\n"
+ , (isStaticVar(vd) ? 1 : 0));
+ }
+
+ prcode(fp,
+"};\n"
+ );
+ }
+
/* Generate each instance table. */
is_inst_class = generateClasses(pt, mod, cd, fp);
is_inst_voidp = generateVoidPointers(pt, mod, cd, fp);
@@ -7980,23 +7699,38 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
is_inst_longlong = generateLongLongs(pt, mod, cd, fp);
is_inst_ulonglong = generateUnsignedLongLongs(pt, mod, cd, fp);
is_inst_double = generateDoubles(pt, mod, cd, fp);
- is_inst_enum = generateEnums(pt, mod, cd, fp);
+
+ if (pluginPyQt4(pt))
+ {
+ type_prefix = "pyqt4";
+ embedded = TRUE;
+ }
+ else if (pluginPyQt3(pt))
+ {
+ type_prefix = "pyqt3";
+ embedded = TRUE;
+ }
+ else
+ {
+ type_prefix = "sip";
+ embedded = FALSE;
+ }
prcode(fp,
"\n"
"\n"
-"sipTypeDef sipType_%s_%C = {\n"
-" 0,\n"
-" ", mname, classFQCName(cd));
+"%sClassTypeDef %sType_%s_%C = {\n"
+"%s"
+" {\n"
+" 0,\n"
+" 0,\n"
+" 0,\n"
+" "
+ , type_prefix, type_prefix, mname, classFQCName(cd)
+ , (embedded ? "{\n" : ""));
sep = "";
- if (cd->userflags)
- {
- prcode(fp, "%s%x", sep, ((cd->userflags << TYPE_FLAGS_SHIFT) & TYPE_FLAGS_MASK));
- sep = "|";
- }
-
if (isAbstractClass(cd))
{
prcode(fp, "%sSIP_TYPE_ABSTRACT", sep);
@@ -8009,27 +7743,54 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
sep = "|";
}
+ if (cd->iff->type == namespace_iface)
+ {
+ prcode(fp, "%sSIP_TYPE_NAMESPACE", sep);
+ sep = "|";
+ }
+ else
+ {
+ prcode(fp, "%sSIP_TYPE_CLASS", sep);
+ sep = "|";
+ }
+
if (*sep == '\0')
prcode(fp, "0");
prcode(fp, ",\n");
- if (cd->real != NULL)
+ prcode(fp,
+" %n,\n"
+" {0}\n"
+" },\n"
+ , cd->iff->name);
+
+ if (cd->real == NULL)
prcode(fp,
-" 0,\n"
+" %n,\n"
+ , cd->pyname);
+ else
+ prcode(fp,
+" -1,\n"
);
- else if (cd->ecd != NULL && cd->ecd->real != NULL)
+
+ if (cd->metatype != NULL)
prcode(fp,
-" \"%s.%P\",\n"
- , cd->ecd->real->iff->module->name, cd->ecd, cd->pyname);
+" %n,\n"
+ , cd->metatype);
else
prcode(fp,
-" \"%s.%P\",\n"
- , mname, cd->ecd, cd->pyname);
+" -1,\n"
+ );
- prcode(fp,
-" \"%S\",\n"
- , classFQCName(cd));
+ if (cd->supertype != NULL)
+ prcode(fp,
+" %n,\n"
+ , cd->supertype);
+ else
+ prcode(fp,
+" -1,\n"
+ );
prcode(fp,
" ");
@@ -8080,14 +7841,14 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
" %d, enummembers_%C,\n"
, nr_enums, classFQCName(cd));
- if (hasVarHandlers(cd))
+ if (nr_vars == 0)
prcode(fp,
-" variables_%C,\n"
- , classFQCName(cd));
+" 0, 0,\n"
+ );
else
prcode(fp,
-" 0,\n"
- );
+" %d, variables_%C,\n"
+ , nr_vars, classFQCName(cd));
if (canCreate(cd))
prcode(fp,
@@ -8168,22 +7929,17 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
);
else
prcode(fp,
-" cast_%C,\n"
" release_%C,\n"
+" cast_%C,\n"
, classFQCName(cd)
, classFQCName(cd));
if (cd->iff->type == namespace_iface)
prcode(fp,
" 0,\n"
-" 0,\n"
);
else
{
- prcode(fp,
-" forceConvertTo_%C,\n"
- , classFQCName(cd));
-
if (cd->convtocode != NULL)
prcode(fp,
" convertTo_%C,\n"
@@ -8194,20 +7950,11 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
);
}
- if (!optNoEmitters(pt) && hasSigSlots(cd))
- prcode(fp,
-" signals_%C,\n"
- , classFQCName(cd));
- else
- prcode(fp,
-" 0,\n"
- );
-
prcode(fp,
" {");
if (is_inst_class)
- prcode(fp, "classInstances_%C, ", classFQCName(cd));
+ prcode(fp, "typeInstances_%C, ", classFQCName(cd));
else
prcode(fp, "0, ");
@@ -8252,12 +7999,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
prcode(fp, "0, ");
if (is_inst_double)
- prcode(fp, "doubleInstances_%C, ", classFQCName(cd));
- else
- prcode(fp, "0, ");
-
- if (is_inst_enum)
- prcode(fp, "enumInstances_%C", classFQCName(cd));
+ prcode(fp, "doubleInstances_%C", classFQCName(cd));
else
prcode(fp, "0");
@@ -8267,30 +8009,63 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
if (cd->picklecode != NULL)
prcode(fp,
-" pickle_%C,\n"
+" pickle_%C\n"
, classFQCName(cd));
else
prcode(fp,
-" 0,\n"
+" 0\n"
);
- if (optAssignmentHelpers(pt) && (generating_c || canAssign(cd)))
+ if (embedded)
prcode(fp,
+"},\n"
+ );
+
+ if (pluginPyQt3(pt))
+ {
+ if (hasSigSlots(cd))
+ prcode(fp,
+" signals_%C\n"
+ , classFQCName(cd));
+ else
+ prcode(fp,
+" 0\n"
+ );
+ }
+
+ if (pluginPyQt4(pt))
+ {
+ if (assignmentHelper(cd))
+ prcode(fp,
" assign_%C,\n"
- , classFQCName(cd));
- else
- prcode(fp,
+ , classFQCName(cd));
+ else
+ prcode(fp,
" 0,\n"
- );
+ );
+
+ if (isQObjectSubClass(cd) && !noPyQt4QMetaObject(cd))
+ prcode(fp,
+" &%U::staticMetaObject,\n"
+ , cd);
+ else
+ prcode(fp,
+" 0,\n"
+ );
- if (isQObjectSubClass(cd) && !noQMetaObject(cd) && optQ_OBJECT4(pt))
- prcode(fp,
-" &%U::staticMetaObject\n"
- , cd);
- else
prcode(fp,
+" %u,\n"
+ , cd->pyqt4_flags);
+
+ if (is_signals)
+ prcode(fp,
+" pyqt4_signals_%C\n"
+ , classFQCName(cd));
+ else
+ prcode(fp,
" 0\n"
- );
+ );
+ }
prcode(fp,
"};\n"
@@ -8299,6 +8074,21 @@ 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)
+{
+ prcode(fp,
+" \"%s(", od->cppname);
+
+ generateCalledArgs(cd, od->cppsig, Declaration, TRUE, fp);
+
+ prcode(fp,")\",\n"
+ );
+}
+
+
+/*
* Return the sip module's string equivalent of a slot.
*/
static const char *slotName(slotType st)
@@ -8549,11 +8339,11 @@ static void generateTypeInit(classDef *cd, FILE *fp)
if (!generating_c)
prcode(fp,
-"extern \"C\" {static void *init_%C(sipWrapper *, PyObject *, sipWrapper **, int *);}\n"
+"extern \"C\" {static void *init_%C(sipSimpleWrapper *, PyObject *, sipWrapper **, int *);}\n"
, classFQCName(cd));
prcode(fp,
-"static void *init_%C(sipWrapper *%s,PyObject *sipArgs,sipWrapper **%s,int *sipArgsParsed)\n"
+"static void *init_%C(sipSimpleWrapper *%s,PyObject *sipArgs,sipWrapper **%s,int *sipArgsParsed)\n"
"{\n"
,classFQCName(cd),(need_self ? "sipSelf" : ""),(need_owner ? "sipOwner" : ""));
@@ -8738,9 +8528,9 @@ static void generateCatch(throwArgs *ta, signatureDef *sd, FILE *fp)
" /* Hope that there is a valid copy ctor. */\n"
" %S *sipExceptionCopy = new %S(sipExceptionRef);\n"
"\n"
-" sipRaise%sClassException(sipClass_%C,sipExceptionCopy);\n"
+" sipRaiseTypeException(sipType_%C,sipExceptionCopy);\n"
, ename, ename
- , (xd->cd->subbase != NULL ? "Sub" : ""), ename);
+ , ename);
else
generateCppCodeBlock(xd->raisecode,fp);
@@ -8795,7 +8585,7 @@ static void generateConstructorCall(classDef *cd,ctorDef *ct,int error_flag,
" if (sipDeprecated(%N,NULL) < 0)\n"
" return NULL;\n"
"\n"
- , cd->iff->name);
+ , cd->pyname);
/* Call any pre-hook. */
if (ct->prehook != NULL)
@@ -8923,15 +8713,14 @@ static void generateFunction(memberDef *md, overDef *overs, classDef *cd,
classDef *ocd, FILE *fp)
{
overDef *od;
- int need_method, need_self, need_args, need_selfarg;
+ int need_method, need_self, need_args;
/*
* Check that there is at least one overload that needs to be handled.
* See if we can avoid naming the "self" argument (and suppress a
- * compiler warning). Finally see if we need to remember if "self" was
- * explicitly passed as an argument.
+ * compiler warning).
*/
- need_method = need_self = need_args = need_selfarg = FALSE;
+ need_method = need_self = need_args = FALSE;
for (od = overs; od != NULL; od = od->next)
{
@@ -8951,12 +8740,7 @@ static void generateFunction(memberDef *md, overDef *overs, classDef *cd,
need_args = TRUE;
if (!isStatic(od))
- {
need_self = TRUE;
-
- if (isAbstract(od) || isVirtual(od) || isVirtualReimp(od) || usedInCode(od->methodcode, "sipSelfWasArg"))
- need_selfarg = TRUE;
- }
}
}
}
@@ -8991,11 +8775,6 @@ static void generateFunction(memberDef *md, overDef *overs, classDef *cd,
" int sipArgsParsed = 0;\n"
);
- if (need_selfarg)
- prcode(fp,
-" bool sipSelfWasArg = !sipSelf;\n"
- );
-
for (od = overs; od != NULL; od = od->next)
{
/*
@@ -9018,7 +8797,7 @@ static void generateFunction(memberDef *md, overDef *overs, classDef *cd,
"\n"
" return NULL;\n"
"}\n"
- ,(need_args ? "sipArgsParsed" : "0"),cd->iff->name,md->pyname);
+ ,(need_args ? "sipArgsParsed" : "0"),cd->pyname,md->pyname);
}
}
@@ -9146,14 +8925,14 @@ static void generateHandleResult(overDef *od, int isNew, int result_size,
if (res->atype == mapped_type)
{
prcode(fp,
-" PyObject *sipResObj = sipConvertFromMappedType(");
+" PyObject *sipResObj = sipConvertFromType(");
if (isConstArg(res))
prcode(fp,"const_cast<%b *>(sipRes)",res);
else
prcode(fp,"sipRes");
- prcode(fp,",sipMappedType_%T,%s);\n"
+ prcode(fp,",sipType_%T,%s);\n"
, res, resultOwner(od));
if (isNew)
@@ -9179,14 +8958,14 @@ static void generateHandleResult(overDef *od, int isNew, int result_size,
if (isNew || isFactory(od))
{
prcode(fp,
-" %s sipConvertFromNewInstance(",(nrvals == 1 ? prefix : "PyObject *sipResObj ="));
+" %s sipConvertFromNewType(",(nrvals == 1 ? prefix : "PyObject *sipResObj ="));
if (isConstArg(res))
prcode(fp,"const_cast<%b *>(sipRes)",res);
else
prcode(fp,"sipRes");
- prcode(fp,",sipClass_%C,%s);\n"
+ prcode(fp,",sipType_%C,%s);\n"
,classFQCName(cd),((has_owner && isFactory(od)) ? "(PyObject *)sipOwner" : "NULL"));
/*
@@ -9198,14 +8977,14 @@ static void generateHandleResult(overDef *od, int isNew, int result_size,
else
{
prcode(fp,
-" %s sipConvertFromInstance(",(nrvals == 1 ? prefix : "PyObject *sipResObj ="));
+" %s sipConvertFromType(",(nrvals == 1 ? prefix : "PyObject *sipResObj ="));
if (isConstArg(res))
prcode(fp,"const_cast<%b *>(sipRes)",res);
else
prcode(fp,"sipRes");
- prcode(fp, ",sipClass_%C,%s);\n"
+ prcode(fp, ",sipType_%C,%s);\n"
, classFQCName(cd), resultOwner(od));
/*
@@ -9240,12 +9019,12 @@ static void generateHandleResult(overDef *od, int isNew, int result_size,
/* Pass the values for conversion. */
if (res != NULL)
{
- prcode(fp,",sipRes");
+ prcode(fp, ",sipRes");
if (res->atype == mapped_type || res->atype == class_type)
- prcode(fp,"Obj");
+ prcode(fp, "Obj");
else if (res->atype == enum_type && res->u.ed->fqcname != NULL)
- prcode(fp,",sipEnum_%C",res->u.ed->fqcname);
+ prcode(fp, ",sipType_%C", res->u.ed->fqcname);
}
for (a = 0; a < od->pysig.nrArgs; ++a)
@@ -9254,14 +9033,14 @@ static void generateHandleResult(overDef *od, int isNew, int result_size,
if (isOutArg(ad))
{
- prcode(fp,",a%d",a);
+ prcode(fp, ",a%d", a);
if (ad->atype == mapped_type)
- prcode(fp, ",sipMappedType_%T,%s", ad, (isTransferredBack(ad) ? "Py_None" : "NULL"));
+ prcode(fp, ",sipType_%T,%s", ad, (isTransferredBack(ad) ? "Py_None" : "NULL"));
else if (ad->atype == class_type)
- prcode(fp, ",sipClass_%C,%s", classFQCName(ad->u.cd), (isTransferredBack(ad) ? "Py_None" : "NULL"));
+ prcode(fp, ",sipType_%C,%s", classFQCName(ad->u.cd), (isTransferredBack(ad) ? "Py_None" : "NULL"));
else if (ad->atype == enum_type && ad->u.ed->fqcname != NULL)
- prcode(fp,",sipEnum_%C",ad->u.ed->fqcname);
+ prcode(fp,",sipType_%C", ad->u.ed->fqcname);
}
}
@@ -9290,14 +9069,14 @@ static void generateHandleResult(overDef *od, int isNew, int result_size,
{
case mapped_type:
prcode(fp,
-" %s sipConvertFromMappedType(", prefix);
+" %s sipConvertFromType(", prefix);
if (isConstArg(ad))
prcode(fp,"const_cast<%b *>(%s)",ad,vname);
else
prcode(fp,"%s",vname);
- prcode(fp,",sipMappedType_%T,%s);\n"
+ prcode(fp,",sipType_%T,%s);\n"
, ad, (isTransferredBack(ad) ? "Py_None" : "NULL"));
break;
@@ -9309,17 +9088,17 @@ static void generateHandleResult(overDef *od, int isNew, int result_size,
if (needNew)
prcode(fp,
-" %s sipConvertFromNewInstance(", prefix);
+" %s sipConvertFromNewType(", prefix);
else
prcode(fp,
-" %s sipConvertFromInstance(", prefix);
+" %s sipConvertFromType(", prefix);
if (isConstArg(ad))
prcode(fp,"const_cast<%b *>(%s)",ad,vname);
else
prcode(fp,"%s",vname);
- prcode(fp,",sipClass_%C,",classFQCName(cd));
+ prcode(fp,",sipType_%C,",classFQCName(cd));
if (needNew)
prcode(fp,"NULL");
@@ -9385,8 +9164,8 @@ static void generateHandleResult(overDef *od, int isNew, int result_size,
if (ad->u.ed->fqcname != NULL)
{
prcode(fp,
-" %s sipConvertFromNamedEnum(%s,sipEnum_%C);\n"
- ,prefix,vname,ad->u.ed->fqcname);
+" %s sipConvertFromEnum(%s,sipType_%C);\n"
+ , prefix, vname, ad->u.ed->fqcname);
break;
}
@@ -9514,9 +9293,9 @@ static char getBuildResultFormat(argDef *ad)
case fake_void_type:
case class_type:
if (needNewInstance(ad))
- return 'B';
+ return 'N';
- return 'C';
+ return 'D';
case bool_type:
case cbool_type:
@@ -9531,7 +9310,7 @@ static char getBuildResultFormat(argDef *ad)
return (ad->nrderefs > (isOutArg(ad) ? 1 : 0)) ? 'x' : 'w';
case enum_type:
- return (ad->u.ed->fqcname != NULL) ? 'E' : 'e';
+ return (ad->u.ed->fqcname != NULL) ? 'F' : 'e';
case short_type:
return 'h';
@@ -9731,16 +9510,22 @@ static void generateFunctionCall(classDef *cd,classDef *ocd,overDef *od,
"\n"
);
- /* If it is abstract make sure that self was bound. */
+ /*
+ * If it is abstract then there can't be a Python implementation otherwise
+ * it would have been called instead of this. If this is not a derived
+ * class (ie. the instance was created by C++) then it must have a C++
+ * implementation we can call. Therefore raise an exception if the
+ * instance was created by Python.
+ */
if (isAbstract(od))
prcode(fp,
-" if (sipSelfWasArg)\n"
+" if (sipIsDerived((sipSimpleWrapper *)sipSelf))\n"
" {\n"
-" sipAbstractMethod(%N,%N);\n"
+" sipAbstractMethod(%N, %N);\n"
" return NULL;\n"
" }\n"
"\n"
- , cd->iff->name, od->common->pyname);
+ , cd->pyname, od->common->pyname);
if (isDeprecated(od))
{
@@ -9748,7 +9533,7 @@ static void generateFunctionCall(classDef *cd,classDef *ocd,overDef *od,
if (cd != NULL)
prcode(fp,
" if (sipDeprecated(%N,%N) < 0)\n"
- , cd->iff->name, od->common->pyname);
+ , cd->pyname, od->common->pyname);
else
prcode(fp,
" if (sipDeprecated(NULL,%N) < 0)\n"
@@ -10095,51 +9880,32 @@ static void generateCppFunctionCall(classDef *cd, classDef *ocd, overDef *od,
FILE *fp)
{
char *mname = od->cppname;
- int parens = 1;
- /*
- * If the function is protected then call the public wrapper. If it is
- * virtual then call the explicit scoped function if "self" was passed as
- * the first argument.
- */
+ /* If the function is protected then call the public wrapper. */
if (cd == NULL)
- prcode(fp,"%s(",mname);
+ prcode(fp, "%s(", mname);
else if (cd->iff->type == namespace_iface)
- prcode(fp,"%S::%s(",classFQCName(cd),mname);
+ prcode(fp, "%S::%s(", classFQCName(cd), mname);
else if (isStatic(od))
{
if (isProtected(od))
- prcode(fp,"sip%C::sipProtect_%s(",classFQCName(cd),mname);
+ prcode(fp, "sip%C::sipProtect_%s(", classFQCName(cd),mname);
else
- prcode(fp,"%S::%s(",classFQCName(ocd),mname);
+ prcode(fp, "%S::%s(", classFQCName(ocd),mname);
}
else if (isProtected(od))
{
- if (!isAbstract(od) && (isVirtual(od) || isVirtualReimp(od)))
- {
- prcode(fp, "sipCpp->sipProtectVirt_%s(sipSelfWasArg", mname);
-
- if (od->cppsig->nrArgs > 0)
- prcode(fp, ",");
- }
- else
- prcode(fp, "sipCpp->sipProtect_%s(", mname);
+ prcode(fp, "sipCpp->sipProtect_%s(", mname);
}
else if (!isAbstract(od) && (isVirtual(od) || isVirtualReimp(od)))
- {
- prcode(fp, "(sipSelfWasArg ? sipCpp->%U::%s(", ocd, mname);
- generateCallArgs(cd, od->cppsig, &od->pysig, fp);
- prcode(fp, ") : sipCpp->%s(", mname);
- ++parens;
- }
+ prcode(fp, "sipCpp->%U::%s(", ocd, mname);
else
prcode(fp, "sipCpp->%s(", mname);
generateCallArgs(cd, od->cppsig, &od->pysig, fp);
- while (parens--)
- prcode(fp, ")");
+ prcode(fp, ")");
}
@@ -10470,9 +10236,6 @@ static int generateArgParser(signatureDef *sd, classDef *cd, ctorDef *ct,
break;
case mapped_type:
- fmt = getSubFormatChar('M',ad);
- break;
-
case class_type:
fmt = getSubFormatChar('J', ad);
break;
@@ -10510,7 +10273,7 @@ static int generateArgParser(signatureDef *sd, classDef *cd, ctorDef *ct,
/* Generate the parameters corresponding to the format string. */
if (handle_self)
- prcode(fp,",&sipSelf,sipClass_%C,&sipCpp",classFQCName(cd));
+ prcode(fp,",&sipSelf,sipType_%C,&sipCpp",classFQCName(cd));
else if (isQtSlot && od == NULL)
prcode(fp,",sipSelf");
@@ -10525,14 +10288,14 @@ static int generateArgParser(signatureDef *sd, classDef *cd, ctorDef *ct,
{
case mapped_type:
if (noRelease(ad->u.mtd))
- prcode(fp, ",sipMappedType_%T,&a%d,NULL", ad, a);
+ prcode(fp, ",sipType_%T,&a%d,NULL", ad, a);
else
- prcode(fp, ",sipMappedType_%T,&a%d,&a%dState", ad, a, a);
+ prcode(fp, ",sipType_%T,&a%d,&a%dState", ad, a, a);
break;
case class_type:
- prcode(fp, ",sipClass_%T,&a%d", ad, a);
+ prcode(fp, ",sipType_%T,&a%d", ad, a);
if (isThisTransferred(ad))
prcode(fp, ",%ssipOwner", (ct != NULL ? "" : "&"));
@@ -10606,7 +10369,7 @@ static int generateArgParser(signatureDef *sd, classDef *cd, ctorDef *ct,
case enum_type:
if (ad->u.ed->fqcname != NULL)
- prcode(fp,",sipEnum_%C",ad->u.ed->fqcname);
+ prcode(fp, ",sipType_%C", ad->u.ed->fqcname);
prcode(fp,",&a%d",a);
break;
@@ -10630,38 +10393,37 @@ static int generateArgParser(signatureDef *sd, classDef *cd, ctorDef *ct,
* Get the format character string for something that has sub-formats.
*/
-static char *getSubFormatChar(char fc,argDef *ad)
+static char *getSubFormatChar(char fc, argDef *ad)
{
static char fmt[3];
char flags;
- fmt[0] = fc;
-
flags = 0;
- if (fc != 'P' && ad->nrderefs == 0)
- flags |= 0x01;
-
if (isTransferred(ad))
flags |= 0x02;
if (isTransferredBack(ad))
flags |= 0x04;
- if (fc == 'J')
+ if (ad->atype == class_type || ad->atype == mapped_type)
{
+ if (ad->nrderefs == 0)
+ flags |= 0x01;
+
if (isThisTransferred(ad))
flags |= 0x20;
if (isGetWrapper(ad))
flags |= 0x08;
- if (ad->u.cd->convtocode == NULL || isConstrained(ad))
- flags |= 0x10;
+ if (ad->atype == class_type)
+ if (ad->u.cd->convtocode == NULL || isConstrained(ad))
+ flags |= 0x10;
}
+ fmt[0] = fc;
fmt[1] = '0' + flags;
-
fmt[2] = '\0';
return fmt;
@@ -10735,20 +10497,8 @@ static void deleteTemps(signatureDef *sd, FILE *fp)
}
else if (hasConvertToCode(ad))
{
- const char *fstr, *sstr;
-
- if (ad->atype == mapped_type)
- {
- if (noRelease(ad->u.mtd))
- continue;
-
- fstr = sstr = "MappedType";
- }
- else
- {
- fstr = "Instance";
- sstr = "Class";
- }
+ if (ad->atype == mapped_type && noRelease(ad->u.mtd))
+ continue;
if (first)
{
@@ -10761,12 +10511,12 @@ static void deleteTemps(signatureDef *sd, FILE *fp)
if (generating_c || !isConstArg(ad))
prcode(fp,
-" sipRelease%s(a%d,sip%s_%T,a%dState);\n"
- , fstr, a, sstr, ad, a);
+" sipReleaseType(a%d,sipType_%T,a%dState);\n"
+ , a, ad, a);
else
prcode(fp,
-" sipRelease%s(const_cast<%b *>(a%d),sip%s_%T,a%dState);\n"
- , fstr, ad, a, sstr, ad, a);
+" sipReleaseType(const_cast<%b *>(a%d),sipType_%T,a%dState);\n"
+ , ad, a, ad, a);
}
}
}
@@ -11017,7 +10767,7 @@ void prcode(FILE *fp, const char *fmt, ...)
resetIsReference(ad);
ad->nrderefs = 0;
- generateBaseType(NULL, ad, fp);
+ generateBaseType(NULL, ad, TRUE, fp);
*ad = orig;
@@ -11033,12 +10783,12 @@ void prcode(FILE *fp, const char *fmt, ...)
classDef *context = va_arg(ap, classDef *);
argDef *ad = va_arg(ap, argDef *);
- generateBaseType(context, ad, fp);
+ generateBaseType(context, ad, TRUE, fp);
break;
}
case 'B':
- generateBaseType(NULL, va_arg(ap,argDef *),fp);
+ generateBaseType(NULL, va_arg(ap,argDef *),TRUE, fp);
break;
case 'T':
@@ -11059,7 +10809,15 @@ void prcode(FILE *fp, const char *fmt, ...)
{
nameDef *nd = va_arg(ap,nameDef *);
- fprintf(fp,"sipNm_%s_%s",nd->module->name,nd->text);
+ prCachedName(fp, nd, "sipName_");
+ break;
+ }
+
+ case 'n':
+ {
+ nameDef *nd = va_arg(ap,nameDef *);
+
+ prCachedName(fp, nd, "sipNameNr_");
break;
}
@@ -11117,15 +10875,6 @@ void prcode(FILE *fp, const char *fmt, ...)
prOverloadName(fp, va_arg(ap, overDef *));
break;
- case 'P':
- {
- classDef *ecd = va_arg(ap, classDef *);
- const char *pyname = va_arg(ap, const char *);
-
- prScopedPythonName(fp, ecd, pyname);
- break;
- }
-
case 'X':
generateThrowSpecifier(va_arg(ap,throwArgs *),fp);
break;
@@ -11147,6 +10896,37 @@ void prcode(FILE *fp, const char *fmt, ...)
/*
+ * Generate the symbolic name of a cached name.
+ */
+static void prCachedName(FILE *fp, nameDef *nd, const char *prefix)
+{
+ prcode(fp, "%s", prefix);
+
+ /*
+ * If the name seems to be a template then just use the offset to ensure
+ * that it is unique.
+ */
+ if (strchr(nd->text, '<') != NULL)
+ prcode(fp, "%d", nd->offset);
+ else
+ {
+ const char *cp;
+
+ /* Handle C++ and Python scopes. */
+ for (cp = nd->text; *cp != '\0'; ++cp)
+ {
+ char ch = *cp;
+
+ if (ch == ':' || ch == '.')
+ ch = '_';
+
+ prcode(fp, "%c", ch);
+ }
+ }
+}
+
+
+/*
* Generate the C++ name of an overloaded function.
*/
void prOverloadName(FILE *fp, overDef *od)
@@ -11326,22 +11106,6 @@ static void prScopedClassName(FILE *fp, classDef *context, classDef *cd)
/*
- * Generate a scoped Python name.
- */
-void prScopedPythonName(FILE *fp, classDef *scope, const char *pyname)
-{
- if (scope != NULL)
- {
- prScopedPythonName(fp, scope->ecd, NULL);
- fprintf(fp, "%s.", scope->pyname);
- }
-
- if (pyname != NULL)
- fprintf(fp, "%s", pyname);
-}
-
-
-/*
* Generate a type name to be used as part of an identifier name.
*/
static void prTypeName(FILE *fp,argDef *ad,int intmpl)
sipgen/gencode.c
@@ -1,7 +1,7 @@
/*
* Wrappers around standard functions that use the heap.
*
- * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
+ * Copyright (c) 2009 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -27,7 +27,6 @@ static void nomem(void);
/*
* Wrap malloc() and handle any errors.
*/
-
void *sipMalloc(size_t n)
{
void *h;
@@ -42,9 +41,22 @@ void *sipMalloc(size_t n)
/*
- * Wrap strdup() and handle any errors.
+ * Wrap calloc() and handle any errors.
*/
+void *sipCalloc(size_t nr, size_t n)
+{
+ void *h;
+ if ((h = calloc(nr, n)) == NULL)
+ nomem();
+
+ return h;
+}
+
+
+/*
+ * Wrap strdup() and handle any errors.
+ */
char *sipStrdup(const char *s)
{
char *h;
@@ -59,7 +71,6 @@ char *sipStrdup(const char *s)
/*
* Return a string on the heap which is the concatonation of all the arguments.
*/
-
char *concat(const char *s, ...)
{
const char *sp;
sipgen/heap.c
@@ -364,8 +364,8 @@ static void yy_fatal_error (yyconst char msg[] );
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 114
-#define YY_END_OF_BUFFER 115
+#define YY_NUM_RULES 116
+#define YY_END_OF_BUFFER 117
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -373,93 +373,97 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[776] =
+static yyconst flex_int16_t yy_accept[802] =
{ 0,
- 0, 0, 0, 0, 0, 0, 115, 113, 67, 68,
- 113, 113, 113, 71, 113, 70, 70, 113, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 113, 67, 113, 112,
- 111, 112, 80, 78, 80, 0, 75, 0, 76, 71,
- 70, 0, 74, 71, 74, 74, 71, 77, 69, 71,
- 0, 49, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 50, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 117, 115, 68, 69,
+ 115, 115, 115, 72, 115, 71, 71, 115, 74, 74,
+ 74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
+ 74, 74, 74, 74, 74, 74, 115, 68, 115, 114,
+ 113, 114, 81, 79, 81, 0, 76, 0, 77, 72,
+ 71, 0, 75, 72, 75, 75, 72, 78, 70, 72,
+ 0, 50, 74, 74, 74, 74, 74, 74, 74, 74,
+ 74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
+ 74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
+ 74, 74, 51, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 79, 71, 0, 66, 0, 0, 71,
- 69, 72, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 29, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 16,
+ 0, 0, 0, 80, 72, 0, 67, 0, 0, 72,
+ 70, 73, 74, 74, 74, 74, 74, 74, 74, 74,
+ 74, 74, 74, 30, 74, 74, 74, 74, 74, 74,
+ 74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
+ 74, 74, 74, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 71,
- 42, 73, 27, 25, 73, 73, 73, 35, 73, 73,
+ 0, 15, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 72, 43, 74, 28, 26, 74, 74, 74, 36, 74,
- 73, 30, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 40, 73, 73, 73, 33, 73,
+ 74, 74, 31, 74, 74, 74, 74, 74, 74, 74,
+ 74, 74, 74, 74, 74, 41, 74, 74, 74, 34,
+ 74, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 106, 18, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 104, 17, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 110, 73, 73,
- 73, 73, 73, 18, 38, 73, 73, 41, 31, 73,
- 73, 73, 73, 73, 28, 73, 73, 24, 73, 73,
- 73, 46, 73, 73, 73, 73, 0, 0, 0, 0,
+ 0, 112, 74, 74, 74, 74, 74, 19, 39, 74,
+ 74, 42, 32, 74, 74, 74, 74, 74, 29, 74,
+ 74, 25, 74, 74, 74, 47, 74, 74, 74, 74,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 73, 73, 73, 73, 73, 73, 32, 73,
- 73, 73, 73, 73, 20, 73, 36, 39, 19, 73,
- 73, 73, 73, 73, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 74, 74, 74,
+ 74, 74, 74, 33, 74, 74, 74, 74, 74, 21,
+ 74, 37, 40, 20, 74, 74, 74, 74, 74, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 22, 73, 23, 73, 43, 73,
+ 0, 0, 0, 0, 0, 0, 74, 74, 74, 74,
+ 74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
- 34, 26, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
- 0, 0, 0, 0, 0, 6, 0, 0, 0, 0,
+ 23, 74, 24, 74, 44, 74, 35, 27, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 59, 47, 73, 45, 73, 48, 37, 6,
- 0, 0, 0, 0, 0, 7, 0, 0, 0, 81,
- 0, 0, 12, 0, 0, 108, 3, 13, 0, 0,
+ 0, 0, 0, 0, 0, 0, 4, 0, 0, 0,
+ 0, 0, 0, 5, 0, 0, 0, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 74, 74,
+ 74, 74, 74, 74, 74, 74, 74, 74, 74, 60,
+ 48, 74, 46, 74, 49, 38, 5, 0, 0, 0,
+ 0, 0, 6, 0, 0, 0, 82, 0, 0, 0,
+ 11, 0, 0, 110, 2, 0, 12, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 111,
+
+ 0, 0, 0, 0, 0, 74, 74, 74, 74, 74,
+ 74, 74, 74, 74, 74, 74, 74, 45, 22, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 109, 0, 0, 0, 0, 0, 73, 73,
-
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 44, 21, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 106, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 10,
- 92, 0, 90, 0, 73, 73, 54, 53, 73, 73,
- 73, 57, 73, 73, 58, 73, 73, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 15, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 11, 0, 0,
- 0, 103, 0, 0, 0, 0, 60, 73, 73, 56,
- 52, 65, 73, 73, 73, 73, 107, 0, 0, 0,
-
+ 0, 0, 0, 0, 0, 108, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 9, 94, 0,
+ 92, 0, 74, 74, 55, 54, 74, 74, 74, 58,
+ 74, 74, 59, 74, 74, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 14, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 10, 0,
+ 0, 0, 105, 0, 0, 61, 74, 74, 57, 53,
+
+ 66, 74, 74, 74, 74, 109, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 14, 93, 91, 0, 0, 101, 0, 0, 0, 0,
- 1, 0, 0, 73, 51, 73, 73, 63, 64, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 105, 0,
- 96, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 73, 61, 62, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 13, 95, 93, 0, 0, 103, 0, 0,
+ 0, 0, 0, 74, 52, 74, 74, 64, 65, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 55, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 102, 2,
+ 107, 0, 98, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 74, 62, 63, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 56, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 95, 0, 0, 0, 0, 87, 0, 0,
- 0, 0, 0, 9, 0, 0, 0, 0, 0, 0,
- 4, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 86, 0, 0, 0, 0, 0, 99,
- 0, 0, 0, 0, 83, 0, 0, 0, 0, 0,
- 0, 0, 8, 0, 0, 85, 0, 0, 94, 100,
- 97, 0, 82, 0, 0, 0, 98, 0, 0, 0,
- 84, 0, 88, 89, 0
+ 0, 0, 0, 0, 0, 104, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 97, 0, 0, 0, 0, 0, 88, 0, 0, 0,
+ 0, 0, 8, 0, 0, 0, 0, 16, 0, 0,
+ 0, 0, 3, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 17, 0, 0, 87, 0, 0,
+ 0, 0, 0, 101, 0, 0, 0, 0, 84, 0,
+ 0, 0, 0, 0, 0, 0, 0, 7, 0, 0,
+ 86, 90, 0, 0, 96, 102, 99, 0, 83, 0,
+ 0, 0, 100, 0, 0, 0, 85, 0, 89, 91,
+
+ 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -505,187 +509,193 @@ static yyconst flex_int32_t yy_meta[66] =
3, 3, 3, 3, 1
} ;
-static yyconst flex_int16_t yy_base[784] =
+static yyconst flex_int16_t yy_base[810] =
{ 0,
- 0, 64, 1646, 65, 64, 66, 1648, 1650, 1650, 1650,
- 70, 73, 68, 73, 80, 84, 88, 1632, 79, 96,
+ 0, 64, 1674, 65, 64, 66, 1676, 1678, 1678, 1678,
+ 70, 73, 68, 73, 80, 84, 88, 1660, 79, 96,
100, 103, 111, 106, 115, 128, 118, 131, 134, 138,
- 141, 163, 171, 145, 177, 180, 1581, 94, 220, 1650,
- 1650, 1625, 1650, 1650, 1632, 131, 1650, 130, 1650, 183,
- 205, 152, 195, 248, 155, 261, 167, 1650, 0, 1650,
- 0, 1650, 198, 253, 266, 271, 274, 277, 280, 288,
+ 141, 163, 171, 145, 177, 180, 1609, 94, 220, 1678,
+ 1678, 1653, 1678, 1678, 1660, 131, 1678, 130, 1678, 183,
+ 205, 152, 195, 248, 155, 261, 167, 1678, 0, 1678,
+ 0, 1678, 198, 253, 266, 271, 274, 277, 280, 288,
291, 294, 297, 300, 303, 310, 313, 317, 320, 325,
328, 331, 334, 342, 347, 361, 366, 375, 370, 380,
- 383, 386, 1650, 219, 420, 1599, 1618, 49, 1586, 105,
+ 383, 386, 1678, 219, 420, 1627, 1646, 49, 113, 130,
- 1594, 177, 354, 1589, 314, 1582, 354, 1595, 147, 150,
- 1582, 1585, 1580, 1650, 399, 443, 221, 171, 411, 448,
+ 1623, 177, 354, 1618, 314, 1611, 354, 1624, 1619, 121,
+ 1610, 1613, 1608, 1678, 399, 443, 190, 220, 411, 448,
0, 0, 405, 453, 456, 460, 463, 466, 469, 472,
475, 478, 481, 486, 489, 492, 495, 499, 503, 518,
508, 521, 529, 532, 535, 538, 543, 546, 556, 561,
- 566, 569, 573, 217, 148, 204, 1581, 1608, 1581, 1586,
- 1607, 1573, 349, 1583, 1581, 223, 1583, 231, 1565, 1650,
- 1567, 1578, 1577, 371, 1561, 1574, 1559, 1573, 1574, 1557,
- 1568, 1563, 1581, 1552, 1557, 1553, 1558, 1550, 1561, 576,
- 589, 596, 593, 606, 609, 621, 624, 627, 631, 636,
-
- 639, 642, 645, 648, 651, 654, 658, 661, 667, 673,
- 676, 684, 694, 700, 704, 707, 711, 722, 725, 728,
- 264, 1561, 1548, 1558, 1556, 1555, 1555, 1543, 235, 1534,
- 1650, 1650, 1551, 1541, 1536, 1542, 1536, 1574, 1536, 1538,
- 1543, 1542, 1531, 1537, 1525, 1534, 1532, 1523, 1522, 343,
- 1522, 400, 1561, 1532, 1531, 1517, 1516, 1650, 731, 737,
- 743, 753, 756, 746, 759, 764, 776, 779, 783, 786,
- 789, 792, 795, 801, 804, 807, 811, 814, 817, 820,
- 823, 826, 842, 852, 856, 859, 1516, 1513, 1514, 1512,
- 1510, 1514, 1513, 1521, 1516, 1509, 1507, 1503, 1516, 1519,
-
- 1505, 1502, 1498, 1503, 1509, 1509, 1499, 1501, 1497, 1499,
- 1503, 1525, 1494, 1483, 1500, 1490, 1488, 1488, 1490, 416,
- 1523, 1480, 862, 874, 865, 884, 900, 905, 879, 908,
- 913, 916, 919, 922, 926, 929, 932, 935, 938, 941,
- 949, 952, 956, 962, 1487, 1480, 951, 1485, 1478, 1483,
- 1477, 1479, 1473, 1472, 1473, 1487, 1467, 1482, 1467, 1480,
- 1466, 1473, 1477, 1476, 1474, 1465, 1472, 1462, 1462, 1465,
- 1455, 1495, 1492, 1452, 1465, 1459, 1453, 1461, 1451, 1463,
- 965, 981, 991, 994, 999, 968, 1002, 1012, 1015, 1018,
- 1023, 1029, 1033, 1038, 1041, 1044, 1049, 1052, 1055, 1058,
-
- 1061, 1064, 1458, 1485, 1453, 1455, 1454, 1442, 1452, 1447,
- 1446, 1436, 1446, 1443, 1446, 1445, 1433, 1443, 1442, 1650,
- 1441, 1440, 1433, 1449, 1465, 541, 1440, 1463, 1423, 1429,
- 1419, 1428, 1421, 1422, 1424, 1427, 1418, 1426, 1428, 1424,
- 1416, 1069, 1072, 1075, 1090, 1094, 1097, 1100, 1103, 1106,
- 1117, 1125, 1128, 1133, 1136, 1139, 1142, 1145, 1148, 1650,
- 1412, 1424, 1423, 1416, 1413, 1650, 1403, 1416, 312, 1650,
- 1405, 1414, 1650, 1440, 1400, 1650, 1650, 1650, 1410, 1391,
- 1399, 1398, 1406, 1399, 1395, 1396, 1389, 1397, 1391, 1400,
- 1394, 1388, 1650, 1396, 1395, 1395, 1393, 1420, 1151, 1156,
-
- 1160, 1163, 1166, 1178, 1181, 1189, 1192, 1195, 1201, 1204,
- 1207, 1214, 1392, 1379, 1390, 1416, 1374, 1386, 1389, 1373,
- 1374, 1374, 342, 1372, 1368, 1650, 1369, 1379, 1378, 1380,
- 1397, 1375, 1361, 1368, 1375, 1362, 1369, 1355, 1359, 1650,
- 1650, 1366, 1650, 1369, 1219, 1222, 1229, 1232, 1235, 1238,
- 1245, 1249, 1252, 1256, 1259, 1266, 1269, 1364, 1392, 1391,
- 1352, 1360, 1377, 1345, 1348, 408, 1650, 1347, 1355, 1355,
- 1353, 1352, 1351, 1350, 1350, 1338, 1320, 1650, 1322, 1301,
- 1334, 1650, 1282, 1281, 1281, 1274, 1272, 1278, 1287, 1290,
- 1293, 1296, 1299, 1302, 1305, 1308, 1650, 1268, 1267, 1261,
-
- 1277, 1237, 1245, 1233, 1225, 1209, 1228, 1210, 1205, 1219,
- 1650, 1650, 1650, 1189, 1183, 1650, 1169, 1170, 1142, 1148,
- 1650, 1167, 1140, 1313, 1320, 1325, 1333, 1336, 1339, 1133,
- 1132, 1111, 1104, 1088, 1087, 1095, 1082, 1067, 1650, 1077,
- 1650, 1065, 1040, 1042, 1042, 1033, 1044, 1021, 1002, 997,
- 1345, 1348, 1351, 989, 984, 961, 972, 957, 979, 930,
- 972, 942, 940, 938, 964, 910, 899, 914, 908, 863,
- 868, 861, 1358, 859, 857, 881, 850, 835, 828, 825,
- 828, 860, 803, 812, 802, 810, 808, 790, 1650, 1650,
- 801, 789, 787, 786, 786, 794, 763, 763, 738, 739,
-
- 724, 760, 1650, 727, 715, 692, 700, 1650, 727, 726,
- 712, 684, 670, 1650, 665, 706, 649, 657, 646, 653,
- 1650, 647, 637, 636, 634, 620, 628, 627, 592, 585,
- 568, 578, 577, 1650, 558, 556, 564, 551, 548, 1650,
- 532, 540, 537, 556, 1650, 523, 509, 543, 505, 489,
- 488, 481, 1650, 476, 461, 1650, 441, 394, 1650, 1650,
- 1650, 390, 1650, 369, 355, 343, 1650, 197, 189, 108,
- 1650, 57, 1650, 1650, 1650, 1370, 1374, 1378, 1382, 1384,
- 1386, 1390, 74
+ 566, 569, 573, 217, 1615, 311, 389, 204, 1608, 1609,
+ 1614, 1635, 1601, 349, 1608, 1610, 1608, 187, 1610, 231,
+ 1592, 1678, 1594, 317, 1605, 371, 1589, 1602, 1587, 1601,
+ 474, 1586, 1597, 1592, 1582, 1587, 1583, 1588, 1580, 1591,
+ 576, 589, 596, 593, 606, 609, 621, 624, 627, 631,
+
+ 636, 639, 642, 645, 648, 651, 654, 658, 661, 667,
+ 673, 676, 684, 694, 700, 704, 707, 711, 722, 725,
+ 728, 264, 1591, 1590, 1577, 1587, 1585, 1584, 1584, 1572,
+ 153, 1563, 1584, 1678, 1678, 1579, 1569, 1564, 1570, 1564,
+ 1602, 1564, 1566, 1558, 1570, 1569, 1558, 1564, 1552, 1561,
+ 1559, 1550, 1560, 1548, 562, 1548, 1587, 1558, 1557, 1543,
+ 1542, 1678, 731, 737, 743, 753, 756, 746, 759, 764,
+ 776, 779, 783, 786, 789, 792, 795, 801, 804, 807,
+ 811, 814, 817, 820, 823, 826, 842, 852, 856, 859,
+ 1542, 1539, 1540, 1538, 1536, 1540, 1539, 1547, 1542, 1531,
+
+ 1534, 1532, 1528, 1541, 1544, 1530, 1527, 1523, 1532, 1527,
+ 1533, 1533, 1523, 1525, 1521, 1523, 1527, 1523, 1548, 1517,
+ 1506, 1523, 1513, 1515, 411, 1548, 1505, 862, 874, 865,
+ 884, 900, 905, 879, 908, 913, 916, 919, 922, 926,
+ 929, 932, 935, 938, 941, 949, 952, 956, 962, 1512,
+ 1505, 951, 1510, 1503, 1508, 1502, 1504, 1505, 1497, 1496,
+ 1497, 1511, 1491, 1506, 1491, 1504, 1506, 1489, 1496, 1500,
+ 1499, 1497, 1488, 1495, 1485, 1485, 1484, 1487, 1477, 1517,
+ 1489, 1483, 1477, 1485, 1475, 1487, 965, 981, 991, 994,
+ 999, 968, 1002, 1012, 1015, 1018, 1023, 1029, 1033, 1038,
+
+ 1041, 1044, 1049, 1052, 1055, 1058, 1061, 1064, 1482, 1509,
+ 1477, 1479, 1478, 1466, 1476, 1471, 1470, 1460, 1470, 1458,
+ 1466, 1469, 1468, 1456, 1466, 1465, 1678, 1464, 1457, 1462,
+ 1455, 1471, 1487, 431, 1462, 1485, 1445, 1678, 1451, 1441,
+ 1450, 1443, 1451, 1442, 1450, 1452, 1448, 1440, 1069, 1072,
+ 1075, 1090, 1094, 1097, 1100, 1103, 1106, 1117, 1125, 1128,
+ 1133, 1136, 1139, 1142, 1145, 1148, 1678, 1436, 1448, 1447,
+ 1440, 1437, 1678, 1427, 1440, 258, 1678, 535, 1429, 1438,
+ 1678, 1464, 1424, 1678, 1678, 1430, 1678, 1433, 1414, 1422,
+ 1421, 1429, 1422, 1418, 1419, 1412, 1420, 1414, 1423, 1678,
+
+ 1421, 1420, 1420, 1418, 1445, 1151, 1156, 1160, 1163, 1166,
+ 1178, 1181, 1189, 1192, 1195, 1201, 1204, 1207, 1214, 1417,
+ 1404, 1415, 1441, 1399, 1411, 1414, 1398, 1399, 1407, 1392,
+ 1397, 391, 1395, 1391, 1390, 1678, 1391, 1401, 1400, 1402,
+ 1419, 1397, 1383, 1390, 1397, 1384, 1391, 1678, 1678, 1390,
+ 1678, 1393, 1219, 1222, 1229, 1232, 1235, 1238, 1245, 1249,
+ 1252, 1256, 1259, 1266, 1269, 1388, 1416, 1415, 1376, 1384,
+ 1401, 1369, 1372, 575, 1367, 1369, 1678, 1369, 1377, 1377,
+ 1375, 1378, 1373, 1372, 1371, 1371, 1361, 1368, 1678, 1371,
+ 1360, 1393, 1678, 1353, 1350, 1272, 1278, 1287, 1290, 1293,
+
+ 1296, 1299, 1302, 1305, 1308, 1678, 1348, 1347, 1346, 1388,
+ 1349, 1357, 1349, 1341, 1336, 1357, 1352, 1353, 1354, 1349,
+ 1374, 1307, 1678, 1678, 1678, 1318, 1309, 1678, 1300, 1291,
+ 1284, 1320, 1289, 1313, 1320, 1325, 1333, 1336, 1339, 1281,
+ 1280, 1267, 1234, 1247, 1246, 1251, 1242, 1217, 1213, 1195,
+ 1678, 1206, 1678, 1182, 1185, 1170, 1169, 1170, 1139, 1149,
+ 1130, 1135, 1345, 1348, 1351, 1133, 1132, 1106, 1117, 1073,
+ 1104, 1066, 1107, 1077, 1058, 1061, 1051, 1049, 1037, 1073,
+ 1029, 1020, 1015, 1000, 991, 985, 1358, 974, 973, 999,
+ 960, 942, 935, 932, 934, 965, 926, 906, 900, 910,
+
+ 900, 866, 868, 865, 846, 1678, 857, 842, 840, 830,
+ 828, 835, 834, 833, 814, 816, 802, 809, 794, 831,
+ 1678, 829, 801, 798, 784, 791, 1678, 822, 791, 790,
+ 739, 724, 1678, 719, 760, 714, 716, 1678, 705, 695,
+ 690, 698, 1678, 680, 674, 672, 670, 669, 661, 684,
+ 649, 644, 639, 646, 1678, 646, 644, 1678, 620, 620,
+ 600, 599, 595, 1678, 571, 578, 577, 595, 1678, 550,
+ 541, 528, 556, 518, 515, 513, 506, 1678, 489, 471,
+ 1678, 1678, 504, 404, 1678, 1678, 1678, 384, 1678, 343,
+ 292, 288, 1678, 250, 222, 108, 1678, 57, 1678, 1678,
+
+ 1678, 1370, 1374, 1378, 1382, 1384, 1386, 1390, 74
} ;
-static yyconst flex_int16_t yy_def[784] =
+static yyconst flex_int16_t yy_def[810] =
{ 0,
- 775, 1, 776, 776, 777, 777, 775, 775, 775, 775,
- 778, 779, 775, 780, 775, 775, 775, 775, 781, 781,
- 781, 781, 781, 781, 781, 781, 781, 781, 781, 781,
- 781, 781, 781, 781, 781, 781, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 778, 775, 779, 775, 775,
- 775, 780, 780, 780, 780, 780, 780, 775, 782, 775,
- 783, 775, 781, 781, 781, 781, 781, 781, 781, 781,
- 781, 781, 781, 781, 781, 781, 781, 781, 781, 781,
- 781, 781, 781, 781, 781, 781, 781, 781, 781, 781,
- 781, 781, 775, 775, 775, 775, 775, 775, 775, 775,
-
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 780, 775, 780, 780,
- 782, 783, 781, 781, 781, 781, 781, 781, 781, 781,
- 781, 781, 781, 781, 781, 781, 781, 781, 781, 781,
- 781, 781, 781, 781, 781, 781, 781, 781, 781, 781,
- 781, 781, 781, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 781, 781, 781, 781, 781, 781, 781, 781, 781, 781,
-
- 781, 781, 781, 781, 781, 781, 781, 781, 781, 781,
- 781, 781, 781, 781, 781, 781, 781, 781, 781, 781,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 781, 781,
- 781, 781, 781, 781, 781, 781, 781, 781, 781, 781,
- 781, 781, 781, 781, 781, 781, 781, 781, 781, 781,
- 781, 781, 781, 781, 781, 781, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
-
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 781, 781, 781, 781, 781, 781, 781, 781,
- 781, 781, 781, 781, 781, 781, 781, 781, 781, 781,
- 781, 781, 781, 781, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 781, 781, 781, 781, 781, 781, 781, 781, 781, 781,
- 781, 781, 781, 781, 781, 781, 781, 781, 781, 781,
-
- 781, 781, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 781, 781, 781, 781, 781, 781, 781, 781, 781,
- 781, 781, 781, 781, 781, 781, 781, 781, 781, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 781, 781,
-
- 781, 781, 781, 781, 781, 781, 781, 781, 781, 781,
- 781, 781, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 781, 781, 781, 781, 781, 781,
- 781, 781, 781, 781, 781, 781, 781, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 781, 781, 781, 781,
- 781, 781, 781, 781, 781, 781, 775, 775, 775, 775,
-
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 781, 781, 781, 781, 781, 781, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 781, 781, 781, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 781, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
-
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 0, 775, 775, 775, 775, 775,
- 775, 775, 775
+ 801, 1, 802, 802, 803, 803, 801, 801, 801, 801,
+ 804, 805, 801, 806, 801, 801, 801, 801, 807, 807,
+ 807, 807, 807, 807, 807, 807, 807, 807, 807, 807,
+ 807, 807, 807, 807, 807, 807, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 804, 801, 805, 801, 801,
+ 801, 806, 806, 806, 806, 806, 806, 801, 808, 801,
+ 809, 801, 807, 807, 807, 807, 807, 807, 807, 807,
+ 807, 807, 807, 807, 807, 807, 807, 807, 807, 807,
+ 807, 807, 807, 807, 807, 807, 807, 807, 807, 807,
+ 807, 807, 801, 801, 801, 801, 801, 801, 801, 801,
+
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 806, 801, 806, 806,
+ 808, 809, 807, 807, 807, 807, 807, 807, 807, 807,
+ 807, 807, 807, 807, 807, 807, 807, 807, 807, 807,
+ 807, 807, 807, 807, 807, 807, 807, 807, 807, 807,
+ 807, 807, 807, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 807, 807, 807, 807, 807, 807, 807, 807, 807,
+
+ 807, 807, 807, 807, 807, 807, 807, 807, 807, 807,
+ 807, 807, 807, 807, 807, 807, 807, 807, 807, 807,
+ 807, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 807, 807, 807, 807, 807, 807, 807, 807,
+ 807, 807, 807, 807, 807, 807, 807, 807, 807, 807,
+ 807, 807, 807, 807, 807, 807, 807, 807, 807, 807,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 807, 807, 807,
+ 807, 807, 807, 807, 807, 807, 807, 807, 807, 807,
+ 807, 807, 807, 807, 807, 807, 807, 807, 807, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 807, 807, 807, 807,
+ 807, 807, 807, 807, 807, 807, 807, 807, 807, 807,
+
+ 807, 807, 807, 807, 807, 807, 807, 807, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 807, 807,
+ 807, 807, 807, 807, 807, 807, 807, 807, 807, 807,
+ 807, 807, 807, 807, 807, 807, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+
+ 801, 801, 801, 801, 801, 807, 807, 807, 807, 807,
+ 807, 807, 807, 807, 807, 807, 807, 807, 807, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 807, 807, 807, 807, 807, 807, 807, 807,
+ 807, 807, 807, 807, 807, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 807, 807, 807, 807, 807,
+
+ 807, 807, 807, 807, 807, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 807, 807, 807, 807, 807, 807, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 807, 807, 807, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 807, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+
+ 0, 801, 801, 801, 801, 801, 801, 801, 801
} ;
-static yyconst flex_int16_t yy_nxt[1716] =
+static yyconst flex_int16_t yy_nxt[1744] =
{ 0,
8, 9, 10, 9, 11, 8, 12, 8, 8, 13,
14, 15, 16, 17, 18, 19, 19, 19, 19, 19,
@@ -694,191 +704,194 @@ static yyconst flex_int16_t yy_nxt[1716] =
19, 19, 22, 23, 24, 25, 26, 19, 19, 27,
19, 28, 19, 29, 30, 31, 19, 32, 33, 34,
35, 36, 19, 19, 37, 38, 44, 41, 44, 39,
- 42, 45, 47, 45, 47, 49, 162, 122, 50, 49,
+ 42, 45, 47, 45, 47, 49, 163, 122, 50, 49,
51, 51, 52, 53, 52, 54, 54, 58, 52, 55,
52, 59, 56, 57, 50, 94, 51, 51, 50, 95,
- 51, 51, 774, 163, 60, 52, 55, 52, 60, 52,
+ 51, 51, 800, 164, 60, 52, 55, 52, 60, 52,
55, 52, 52, 55, 52, 52, 55, 52, 56, 57,
52, 55, 52, 65, 52, 55, 52, 52, 55, 52,
60, 64, 49, 47, 60, 47, 49, 52, 55, 52,
52, 55, 52, 52, 55, 52, 61, 52, 55, 52,
- 52, 55, 52, 773, 52, 55, 52, 66, 165, 67,
+ 52, 55, 52, 799, 52, 55, 52, 66, 165, 67,
70, 52, 68, 52, 52, 69, 52, 166, 71, 73,
- 183, 75, 52, 55, 52, 77, 52, 72, 52, 74,
- 52, 55, 52, 190, 190, 76, 52, 55, 52, 52,
- 55, 52, 184, 78, 168, 115, 115, 79, 89, 185,
-
- 80, 165, 116, 60, 52, 117, 52, 52, 55, 52,
- 222, 81, 82, 186, 83, 50, 85, 51, 51, 86,
- 94, 84, 169, 92, 95, 60, 90, 87, 116, 60,
- 52, 91, 52, 772, 88, 96, 97, 98, 99, 100,
- 101, 102, 771, 103, 162, 223, 104, 105, 236, 106,
- 107, 60, 108, 109, 110, 111, 112, 52, 224, 52,
- 54, 54, 52, 55, 52, 237, 233, 56, 57, 118,
- 119, 221, 52, 120, 120, 52, 55, 52, 234, 123,
+ 186, 75, 52, 55, 52, 77, 52, 72, 52, 74,
+ 52, 55, 52, 167, 187, 76, 52, 55, 52, 52,
+ 55, 52, 168, 78, 170, 115, 115, 79, 89, 52,
+
+ 80, 52, 116, 60, 52, 117, 52, 52, 55, 52,
+ 297, 81, 82, 298, 83, 50, 85, 51, 51, 86,
+ 94, 84, 171, 92, 95, 60, 90, 87, 116, 60,
+ 236, 91, 191, 191, 88, 96, 97, 98, 99, 100,
+ 101, 102, 237, 103, 163, 225, 104, 105, 239, 106,
+ 107, 60, 108, 109, 110, 111, 112, 52, 226, 52,
+ 54, 54, 52, 55, 52, 240, 798, 56, 57, 118,
+ 119, 222, 52, 120, 120, 52, 55, 52, 527, 123,
52, 55, 52, 52, 55, 52, 52, 55, 52, 52,
- 55, 52, 293, 56, 57, 294, 124, 52, 55, 52,
+ 55, 52, 528, 56, 57, 797, 124, 52, 55, 52,
52, 55, 52, 52, 55, 52, 52, 55, 52, 52,
- 55, 52, 52, 55, 52, 126, 228, 287, 127, 52,
+ 55, 52, 52, 55, 52, 126, 230, 291, 127, 52,
55, 52, 52, 55, 52, 125, 52, 55, 52, 52,
- 55, 52, 520, 128, 52, 55, 52, 52, 55, 52,
- 52, 55, 52, 52, 55, 52, 521, 129, 132, 131,
- 130, 52, 55, 52, 133, 174, 52, 55, 52, 175,
- 568, 134, 137, 135, 569, 136, 313, 140, 176, 138,
- 52, 55, 52, 314, 139, 52, 55, 52, 142, 52,
- 55, 52, 141, 144, 52, 55, 52, 770, 143, 52,
+ 55, 52, 796, 128, 52, 55, 52, 52, 55, 52,
+ 52, 55, 52, 52, 55, 52, 795, 129, 132, 131,
+ 130, 52, 55, 52, 133, 176, 52, 55, 52, 177,
+ 243, 134, 137, 135, 167, 136, 244, 140, 178, 138,
+ 52, 55, 52, 223, 139, 52, 55, 52, 142, 52,
+ 55, 52, 141, 144, 52, 55, 52, 794, 143, 52,
55, 52, 52, 55, 52, 52, 55, 52, 145, 146,
- 170, 228, 229, 178, 230, 179, 171, 172, 180, 769,
- 181, 115, 115, 768, 52, 55, 52, 147, 116, 60,
- 52, 242, 52, 120, 120, 148, 243, 150, 316, 317,
- 149, 191, 152, 377, 153, 767, 151, 154, 378, 155,
- 101, 605, 606, 103, 116, 60, 104, 156, 766, 106,
- 157, 118, 118, 158, 159, 190, 190, 52, 765, 52,
+ 172, 230, 231, 180, 232, 181, 173, 174, 182, 578,
+ 183, 115, 115, 579, 52, 55, 52, 147, 116, 60,
+ 52, 246, 52, 120, 120, 148, 247, 150, 383, 793,
+ 149, 192, 152, 384, 153, 172, 151, 154, 155, 156,
+ 101, 173, 224, 157, 116, 60, 104, 158, 491, 106,
+ 159, 118, 118, 492, 160, 191, 191, 52, 792, 52,
120, 120, 52, 55, 52, 52, 55, 52, 57, 52,
55, 52, 52, 55, 52, 52, 55, 52, 52, 55,
52, 52, 55, 52, 52, 55, 52, 52, 55, 52,
- 52, 55, 52, 192, 57, 52, 55, 52, 52, 55,
+ 52, 55, 52, 193, 57, 52, 55, 52, 52, 55,
- 52, 52, 55, 52, 52, 55, 52, 193, 52, 55,
- 52, 197, 52, 55, 52, 764, 194, 52, 55, 52,
- 195, 763, 201, 196, 198, 762, 199, 52, 55, 52,
- 52, 55, 52, 761, 760, 200, 202, 203, 52, 55,
+ 52, 52, 55, 52, 52, 55, 52, 194, 52, 55,
+ 52, 198, 52, 55, 52, 252, 195, 52, 55, 52,
+ 196, 791, 202, 197, 199, 790, 200, 52, 55, 52,
+ 52, 55, 52, 253, 789, 201, 203, 204, 52, 55,
52, 52, 55, 52, 52, 55, 52, 52, 55, 52,
- 759, 204, 52, 55, 52, 52, 55, 52, 482, 205,
- 758, 206, 757, 483, 208, 52, 55, 52, 756, 207,
- 52, 55, 52, 755, 209, 52, 55, 52, 52, 55,
- 52, 754, 52, 55, 52, 753, 752, 210, 190, 190,
- 211, 215, 751, 213, 212, 750, 60, 214, 52, 55,
-
- 52, 216, 52, 55, 52, 52, 55, 52, 749, 748,
- 217, 259, 747, 219, 220, 52, 55, 52, 52, 55,
- 52, 746, 60, 745, 218, 744, 260, 261, 262, 263,
- 52, 55, 52, 52, 55, 52, 52, 55, 52, 743,
- 52, 55, 52, 742, 741, 52, 55, 52, 52, 55,
+ 788, 205, 52, 55, 52, 52, 55, 52, 787, 206,
+ 786, 207, 529, 785, 209, 52, 55, 52, 530, 208,
+ 52, 55, 52, 784, 210, 52, 55, 52, 52, 55,
+ 52, 783, 52, 55, 52, 320, 782, 211, 191, 191,
+ 212, 216, 321, 214, 213, 781, 60, 215, 52, 55,
+
+ 52, 217, 52, 55, 52, 52, 55, 52, 614, 615,
+ 218, 263, 780, 220, 221, 52, 55, 52, 52, 55,
+ 52, 779, 60, 778, 219, 777, 264, 265, 266, 267,
+ 52, 55, 52, 52, 55, 52, 52, 55, 52, 776,
+ 52, 55, 52, 775, 774, 52, 55, 52, 52, 55,
52, 52, 55, 52, 52, 55, 52, 52, 55, 52,
- 52, 55, 52, 52, 55, 52, 264, 52, 55, 52,
- 52, 55, 52, 740, 739, 266, 52, 55, 52, 265,
- 267, 268, 52, 55, 52, 52, 55, 52, 738, 271,
- 737, 736, 272, 52, 55, 52, 735, 269, 734, 273,
-
- 733, 732, 270, 52, 55, 52, 731, 274, 276, 52,
- 55, 52, 277, 52, 55, 52, 52, 55, 52, 275,
- 52, 55, 52, 730, 729, 279, 728, 280, 727, 726,
- 278, 52, 55, 52, 52, 55, 52, 52, 55, 52,
- 52, 55, 52, 725, 724, 281, 52, 55, 52, 723,
- 722, 283, 52, 55, 52, 52, 55, 52, 284, 323,
- 721, 282, 52, 55, 52, 52, 55, 52, 52, 55,
- 52, 720, 325, 52, 55, 52, 324, 719, 718, 327,
- 717, 285, 328, 716, 286, 52, 55, 52, 52, 55,
- 52, 326, 52, 55, 52, 52, 55, 52, 52, 55,
-
- 52, 52, 55, 52, 52, 55, 52, 715, 714, 329,
- 52, 55, 52, 52, 55, 52, 52, 55, 52, 330,
+ 52, 55, 52, 52, 55, 52, 268, 52, 55, 52,
+ 52, 55, 52, 773, 772, 270, 52, 55, 52, 269,
+ 271, 272, 52, 55, 52, 52, 55, 52, 771, 275,
+ 770, 769, 276, 52, 55, 52, 768, 273, 767, 277,
+
+ 766, 765, 274, 52, 55, 52, 764, 278, 280, 52,
+ 55, 52, 281, 52, 55, 52, 52, 55, 52, 279,
+ 52, 55, 52, 763, 762, 283, 761, 284, 760, 759,
+ 282, 52, 55, 52, 52, 55, 52, 52, 55, 52,
+ 52, 55, 52, 758, 757, 285, 52, 55, 52, 756,
+ 755, 287, 52, 55, 52, 52, 55, 52, 288, 328,
+ 754, 286, 52, 55, 52, 52, 55, 52, 52, 55,
+ 52, 753, 330, 52, 55, 52, 329, 752, 751, 332,
+ 750, 289, 333, 749, 290, 52, 55, 52, 52, 55,
+ 52, 331, 52, 55, 52, 52, 55, 52, 52, 55,
+
+ 52, 52, 55, 52, 52, 55, 52, 748, 747, 334,
+ 52, 55, 52, 52, 55, 52, 52, 55, 52, 335,
52, 55, 52, 52, 55, 52, 52, 55, 52, 52,
- 55, 52, 52, 55, 52, 52, 55, 52, 334, 713,
- 712, 331, 711, 710, 335, 709, 708, 332, 707, 706,
- 333, 52, 55, 52, 705, 337, 704, 703, 336, 702,
- 338, 52, 55, 52, 340, 52, 55, 52, 52, 55,
- 52, 52, 55, 52, 52, 55, 52, 701, 339, 700,
- 699, 388, 698, 52, 55, 52, 697, 341, 52, 55,
- 52, 382, 383, 52, 55, 52, 696, 343, 695, 344,
-
- 384, 381, 694, 385, 693, 342, 692, 386, 387, 52,
- 55, 52, 691, 389, 52, 55, 52, 52, 55, 52,
- 690, 390, 52, 55, 52, 52, 55, 52, 52, 55,
- 52, 52, 55, 52, 391, 52, 55, 52, 52, 55,
+ 55, 52, 52, 55, 52, 52, 55, 52, 339, 746,
+ 745, 336, 744, 743, 340, 742, 741, 337, 740, 739,
+ 338, 52, 55, 52, 738, 342, 737, 736, 341, 735,
+ 343, 52, 55, 52, 345, 52, 55, 52, 52, 55,
+ 52, 52, 55, 52, 52, 55, 52, 734, 344, 733,
+ 732, 394, 731, 52, 55, 52, 730, 346, 52, 55,
+ 52, 388, 389, 52, 55, 52, 729, 348, 728, 349,
+
+ 390, 387, 727, 391, 726, 347, 725, 392, 393, 52,
+ 55, 52, 724, 395, 52, 55, 52, 52, 55, 52,
+ 723, 396, 52, 55, 52, 52, 55, 52, 52, 55,
+ 52, 52, 55, 52, 397, 52, 55, 52, 52, 55,
52, 52, 55, 52, 52, 55, 52, 52, 55, 52,
- 52, 55, 52, 689, 393, 688, 687, 392, 52, 55,
- 52, 52, 55, 52, 395, 52, 55, 52, 405, 686,
- 394, 52, 55, 52, 52, 55, 52, 52, 55, 52,
- 396, 685, 684, 406, 407, 683, 397, 682, 408, 681,
- 52, 55, 52, 680, 447, 399, 443, 400, 442, 398,
-
- 52, 55, 52, 52, 55, 52, 679, 401, 52, 55,
- 52, 52, 55, 52, 444, 446, 678, 445, 677, 676,
- 402, 52, 55, 52, 52, 55, 52, 52, 55, 52,
- 675, 451, 52, 55, 52, 674, 450, 448, 52, 55,
- 52, 449, 52, 55, 52, 672, 452, 52, 55, 52,
- 52, 55, 52, 52, 55, 52, 671, 453, 52, 55,
+ 52, 55, 52, 722, 399, 721, 720, 398, 52, 55,
+ 52, 52, 55, 52, 401, 52, 55, 52, 411, 719,
+ 400, 52, 55, 52, 52, 55, 52, 52, 55, 52,
+ 402, 718, 717, 412, 413, 716, 403, 715, 414, 714,
+ 52, 55, 52, 713, 454, 405, 450, 406, 449, 404,
+
+ 52, 55, 52, 52, 55, 52, 712, 407, 52, 55,
+ 52, 52, 55, 52, 451, 453, 711, 452, 710, 709,
+ 408, 52, 55, 52, 52, 55, 52, 52, 55, 52,
+ 708, 458, 52, 55, 52, 707, 457, 455, 52, 55,
+ 52, 456, 52, 55, 52, 706, 459, 52, 55, 52,
+ 52, 55, 52, 52, 55, 52, 705, 460, 52, 55,
52, 52, 55, 52, 52, 55, 52, 52, 55, 52,
- 52, 55, 52, 52, 55, 52, 455, 670, 52, 55,
- 52, 52, 55, 52, 52, 55, 52, 454, 669, 457,
- 668, 667, 501, 666, 456, 499, 665, 458, 500, 52,
-
- 55, 52, 459, 52, 55, 52, 52, 55, 52, 52,
- 55, 52, 52, 55, 52, 52, 55, 52, 503, 664,
- 504, 663, 662, 502, 661, 507, 52, 55, 52, 660,
- 505, 659, 658, 506, 52, 55, 52, 52, 55, 52,
- 509, 508, 52, 55, 52, 52, 55, 52, 52, 55,
+ 52, 55, 52, 52, 55, 52, 462, 704, 52, 55,
+ 52, 52, 55, 52, 52, 55, 52, 461, 703, 464,
+ 702, 701, 508, 700, 463, 506, 699, 465, 507, 52,
+
+ 55, 52, 466, 52, 55, 52, 52, 55, 52, 52,
+ 55, 52, 52, 55, 52, 52, 55, 52, 510, 698,
+ 511, 697, 696, 509, 695, 514, 52, 55, 52, 694,
+ 512, 693, 692, 513, 52, 55, 52, 52, 55, 52,
+ 516, 515, 52, 55, 52, 52, 55, 52, 52, 55,
52, 52, 55, 52, 52, 55, 52, 52, 55, 52,
- 52, 55, 52, 657, 656, 52, 55, 52, 510, 52,
- 55, 52, 52, 55, 52, 52, 55, 52, 655, 654,
- 545, 511, 546, 650, 649, 549, 512, 52, 55, 52,
- 52, 55, 52, 648, 547, 550, 647, 548, 52, 55,
-
- 52, 52, 55, 52, 52, 55, 52, 551, 552, 553,
- 52, 55, 52, 52, 55, 52, 52, 55, 52, 646,
- 645, 556, 557, 52, 55, 52, 644, 555, 52, 55,
- 52, 52, 55, 52, 643, 554, 642, 588, 52, 55,
+ 52, 55, 52, 691, 690, 52, 55, 52, 517, 52,
+ 55, 52, 52, 55, 52, 52, 55, 52, 689, 688,
+ 553, 518, 554, 686, 685, 557, 519, 52, 55, 52,
+ 52, 55, 52, 684, 555, 558, 683, 556, 52, 55,
+
+ 52, 52, 55, 52, 52, 55, 52, 559, 560, 561,
+ 52, 55, 52, 52, 55, 52, 52, 55, 52, 682,
+ 681, 564, 565, 52, 55, 52, 680, 563, 52, 55,
+ 52, 52, 55, 52, 679, 562, 678, 597, 52, 55,
52, 52, 55, 52, 52, 55, 52, 52, 55, 52,
- 641, 640, 589, 587, 52, 55, 52, 590, 52, 55,
- 52, 52, 55, 52, 591, 52, 55, 52, 52, 55,
- 52, 639, 638, 593, 594, 52, 55, 52, 52, 55,
- 52, 52, 55, 52, 637, 636, 592, 52, 55, 52,
- 635, 634, 596, 633, 624, 595, 52, 55, 52, 52,
+ 677, 676, 598, 596, 52, 55, 52, 599, 52, 55,
+ 52, 52, 55, 52, 600, 52, 55, 52, 52, 55,
+ 52, 675, 674, 602, 603, 52, 55, 52, 52, 55,
+ 52, 52, 55, 52, 673, 672, 601, 52, 55, 52,
+ 671, 670, 605, 669, 634, 604, 52, 55, 52, 52,
55, 52, 52, 55, 52, 52, 55, 52, 52, 55,
52, 52, 55, 52, 52, 55, 52, 52, 55, 52,
- 632, 625, 52, 55, 52, 627, 631, 630, 626, 52,
- 55, 52, 623, 628, 52, 55, 52, 622, 621, 651,
- 620, 629, 52, 55, 52, 52, 55, 52, 52, 55,
- 52, 619, 618, 652, 52, 55, 52, 52, 55, 52,
- 52, 55, 52, 617, 673, 616, 653, 52, 55, 52,
+ 668, 635, 52, 55, 52, 637, 667, 666, 636, 52,
+ 55, 52, 662, 638, 52, 55, 52, 661, 660, 663,
+ 659, 639, 52, 55, 52, 52, 55, 52, 52, 55,
+ 52, 658, 657, 664, 52, 55, 52, 52, 55, 52,
+ 52, 55, 52, 656, 687, 655, 665, 52, 55, 52,
40, 40, 40, 40, 43, 43, 43, 43, 46, 46,
46, 46, 48, 48, 48, 48, 55, 55, 63, 63,
- 121, 615, 121, 121, 614, 613, 612, 611, 610, 609,
-
- 608, 607, 604, 603, 602, 601, 600, 599, 598, 597,
- 586, 585, 584, 583, 582, 581, 580, 579, 578, 577,
- 576, 575, 574, 573, 572, 571, 570, 567, 566, 565,
- 564, 563, 562, 561, 560, 559, 558, 544, 543, 542,
- 541, 540, 539, 538, 537, 536, 535, 534, 533, 532,
- 531, 530, 529, 528, 527, 526, 525, 524, 523, 522,
- 519, 518, 517, 516, 515, 514, 513, 498, 497, 496,
- 495, 494, 493, 492, 491, 490, 489, 488, 487, 486,
- 485, 484, 481, 480, 479, 478, 477, 476, 475, 474,
- 473, 472, 471, 470, 469, 468, 467, 466, 465, 464,
-
- 463, 462, 461, 460, 441, 440, 439, 438, 437, 436,
- 435, 434, 433, 432, 431, 430, 429, 428, 427, 426,
- 425, 424, 423, 422, 421, 420, 419, 418, 417, 416,
- 415, 414, 413, 412, 411, 410, 409, 404, 403, 380,
- 379, 376, 375, 374, 373, 372, 371, 370, 369, 368,
- 367, 366, 365, 364, 363, 362, 361, 360, 359, 358,
- 357, 356, 355, 354, 353, 352, 351, 350, 349, 348,
- 347, 346, 345, 293, 322, 321, 320, 319, 318, 315,
- 312, 311, 310, 309, 308, 307, 306, 305, 304, 303,
- 302, 301, 300, 299, 298, 297, 296, 295, 292, 291,
-
- 290, 289, 288, 243, 233, 258, 257, 256, 255, 254,
- 253, 252, 251, 250, 249, 248, 247, 246, 245, 244,
- 241, 240, 239, 238, 235, 232, 231, 227, 226, 225,
- 185, 183, 179, 189, 188, 187, 182, 177, 173, 167,
- 164, 161, 160, 114, 113, 93, 62, 775, 41, 7,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
-
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775
+ 121, 654, 121, 121, 653, 652, 651, 650, 649, 648,
+
+ 647, 646, 645, 644, 643, 642, 641, 640, 633, 632,
+ 631, 630, 629, 628, 627, 626, 625, 624, 623, 622,
+ 621, 620, 619, 618, 617, 616, 613, 612, 611, 610,
+ 609, 608, 607, 606, 595, 594, 593, 592, 591, 590,
+ 589, 588, 587, 586, 585, 584, 583, 582, 581, 580,
+ 577, 576, 575, 574, 573, 572, 571, 570, 569, 568,
+ 567, 566, 552, 551, 550, 549, 548, 547, 546, 545,
+ 544, 543, 542, 541, 540, 539, 538, 537, 536, 535,
+ 534, 533, 532, 531, 526, 525, 524, 523, 522, 521,
+ 520, 505, 504, 503, 502, 501, 500, 499, 498, 497,
+
+ 496, 495, 494, 493, 490, 489, 488, 487, 486, 485,
+ 484, 483, 482, 481, 480, 479, 478, 477, 476, 475,
+ 474, 473, 472, 471, 470, 469, 468, 467, 448, 447,
+ 446, 445, 444, 443, 442, 441, 440, 439, 438, 437,
+ 436, 435, 434, 433, 432, 431, 430, 429, 428, 427,
+ 426, 425, 424, 423, 422, 421, 420, 419, 418, 417,
+ 416, 415, 410, 409, 386, 385, 382, 381, 380, 379,
+ 378, 377, 376, 375, 374, 373, 372, 371, 370, 369,
+ 368, 367, 366, 365, 364, 363, 362, 361, 360, 359,
+ 358, 357, 356, 355, 354, 353, 352, 351, 350, 297,
+
+ 327, 326, 325, 324, 323, 322, 319, 318, 317, 316,
+ 315, 314, 313, 312, 311, 310, 309, 308, 307, 306,
+ 305, 304, 303, 302, 301, 300, 299, 296, 295, 294,
+ 293, 292, 247, 243, 236, 262, 261, 260, 259, 258,
+ 257, 256, 255, 254, 251, 250, 249, 248, 245, 242,
+ 241, 238, 235, 234, 233, 229, 228, 227, 186, 181,
+ 165, 190, 189, 188, 185, 184, 179, 175, 169, 162,
+ 161, 114, 113, 93, 62, 801, 41, 7, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801
} ;
-static yyconst flex_int16_t yy_chk[1716] =
+static yyconst flex_int16_t yy_chk[1744] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -887,188 +900,191 @@ static yyconst flex_int16_t yy_chk[1716] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 2, 5, 4, 6, 2,
- 4, 5, 11, 6, 11, 12, 98, 783, 13, 12,
+ 4, 5, 11, 6, 11, 12, 98, 809, 13, 12,
13, 13, 14, 14, 14, 14, 14, 15, 19, 19,
19, 15, 14, 14, 16, 38, 16, 16, 17, 38,
- 17, 17, 772, 98, 16, 20, 20, 20, 17, 21,
+ 17, 17, 798, 98, 16, 20, 20, 20, 17, 21,
21, 21, 22, 22, 22, 24, 24, 24, 14, 14,
23, 23, 23, 21, 25, 25, 25, 27, 27, 27,
16, 20, 48, 46, 17, 46, 48, 26, 26, 26,
28, 28, 28, 29, 29, 29, 16, 30, 30, 30,
- 31, 31, 31, 770, 34, 34, 34, 22, 100, 23,
- 24, 52, 23, 52, 55, 23, 55, 100, 25, 26,
- 109, 27, 32, 32, 32, 29, 57, 25, 57, 26,
- 33, 33, 33, 118, 118, 28, 35, 35, 35, 36,
- 36, 36, 109, 30, 102, 50, 50, 31, 34, 110,
-
- 31, 155, 50, 50, 53, 53, 53, 63, 63, 63,
- 155, 32, 32, 110, 32, 51, 33, 51, 51, 33,
+ 31, 31, 31, 796, 34, 34, 34, 22, 99, 23,
+ 24, 52, 23, 52, 55, 23, 55, 99, 25, 26,
+ 110, 27, 32, 32, 32, 29, 57, 25, 57, 26,
+ 33, 33, 33, 100, 110, 28, 35, 35, 35, 36,
+ 36, 36, 100, 30, 102, 50, 50, 31, 34, 117,
+
+ 31, 117, 50, 50, 53, 53, 53, 63, 63, 63,
+ 231, 32, 32, 231, 32, 51, 33, 51, 51, 33,
94, 32, 102, 36, 94, 51, 35, 33, 50, 50,
- 117, 35, 117, 769, 33, 39, 39, 39, 39, 39,
- 39, 39, 768, 39, 154, 156, 39, 39, 168, 39,
- 39, 51, 39, 39, 39, 39, 39, 54, 156, 54,
- 54, 54, 64, 64, 64, 168, 166, 54, 54, 56,
- 56, 154, 56, 56, 56, 65, 65, 65, 166, 64,
+ 168, 35, 118, 118, 33, 39, 39, 39, 39, 39,
+ 39, 39, 168, 39, 154, 158, 39, 39, 170, 39,
+ 39, 51, 39, 39, 39, 39, 39, 54, 158, 54,
+ 54, 54, 64, 64, 64, 170, 795, 54, 54, 56,
+ 56, 154, 56, 56, 56, 65, 65, 65, 476, 64,
66, 66, 66, 67, 67, 67, 68, 68, 68, 69,
- 69, 69, 229, 54, 54, 229, 65, 70, 70, 70,
+ 69, 69, 476, 54, 54, 794, 65, 70, 70, 70,
71, 71, 71, 72, 72, 72, 73, 73, 73, 74,
- 74, 74, 75, 75, 75, 67, 221, 221, 68, 76,
+ 74, 74, 75, 75, 75, 67, 222, 222, 68, 76,
76, 76, 77, 77, 77, 66, 78, 78, 78, 79,
- 79, 79, 469, 69, 80, 80, 80, 81, 81, 81,
- 82, 82, 82, 83, 83, 83, 469, 70, 73, 72,
+ 79, 79, 792, 69, 80, 80, 80, 81, 81, 81,
+ 82, 82, 82, 83, 83, 83, 791, 70, 73, 72,
71, 84, 84, 84, 74, 105, 85, 85, 85, 105,
- 523, 75, 78, 76, 523, 77, 250, 80, 105, 79,
- 86, 86, 86, 250, 79, 87, 87, 87, 82, 89,
- 89, 89, 81, 84, 88, 88, 88, 766, 83, 90,
+ 174, 75, 78, 76, 156, 77, 174, 80, 105, 79,
+ 86, 86, 86, 156, 79, 87, 87, 87, 82, 89,
+ 89, 89, 81, 84, 88, 88, 88, 790, 83, 90,
90, 90, 91, 91, 91, 92, 92, 92, 84, 85,
- 103, 163, 163, 107, 163, 107, 103, 103, 107, 765,
- 107, 115, 115, 764, 123, 123, 123, 86, 115, 115,
- 119, 174, 119, 119, 119, 87, 174, 89, 252, 252,
- 88, 123, 91, 320, 92, 762, 90, 95, 320, 95,
- 95, 566, 566, 95, 115, 115, 95, 95, 758, 95,
- 95, 116, 116, 95, 95, 116, 116, 120, 757, 120,
+ 103, 164, 164, 107, 164, 107, 103, 103, 107, 532,
+ 107, 115, 115, 532, 123, 123, 123, 86, 115, 115,
+ 119, 176, 119, 119, 119, 87, 176, 89, 325, 788,
+ 88, 123, 91, 325, 92, 157, 90, 95, 95, 95,
+ 95, 157, 157, 95, 115, 115, 95, 95, 434, 95,
+ 95, 116, 116, 434, 95, 116, 116, 120, 784, 120,
120, 120, 124, 124, 124, 125, 125, 125, 120, 126,
126, 126, 127, 127, 127, 128, 128, 128, 129, 129,
129, 130, 130, 130, 131, 131, 131, 132, 132, 132,
133, 133, 133, 124, 120, 134, 134, 134, 135, 135,
135, 136, 136, 136, 137, 137, 137, 125, 138, 138,
- 138, 129, 139, 139, 139, 755, 126, 141, 141, 141,
- 127, 754, 133, 128, 130, 752, 131, 140, 140, 140,
- 142, 142, 142, 751, 750, 132, 135, 136, 143, 143,
+ 138, 129, 139, 139, 139, 181, 126, 141, 141, 141,
+ 127, 783, 133, 128, 130, 780, 131, 140, 140, 140,
+ 142, 142, 142, 181, 779, 132, 135, 136, 143, 143,
143, 144, 144, 144, 145, 145, 145, 146, 146, 146,
- 749, 137, 147, 147, 147, 148, 148, 148, 426, 138,
- 748, 139, 747, 426, 141, 149, 149, 149, 746, 140,
- 150, 150, 150, 744, 142, 151, 151, 151, 152, 152,
- 152, 743, 153, 153, 153, 742, 741, 143, 190, 190,
- 144, 148, 739, 146, 145, 738, 190, 147, 191, 191,
-
- 191, 149, 193, 193, 193, 192, 192, 192, 737, 736,
- 150, 192, 735, 152, 153, 194, 194, 194, 195, 195,
- 195, 733, 190, 732, 151, 731, 192, 192, 192, 192,
- 196, 196, 196, 197, 197, 197, 198, 198, 198, 730,
- 199, 199, 199, 729, 728, 200, 200, 200, 201, 201,
- 201, 202, 202, 202, 203, 203, 203, 204, 204, 204,
- 205, 205, 205, 206, 206, 206, 195, 207, 207, 207,
- 208, 208, 208, 727, 726, 197, 209, 209, 209, 196,
- 199, 200, 210, 210, 210, 211, 211, 211, 725, 204,
- 724, 723, 205, 212, 212, 212, 722, 201, 720, 206,
-
- 719, 718, 203, 213, 213, 213, 717, 207, 209, 214,
- 214, 214, 209, 215, 215, 215, 216, 216, 216, 208,
- 217, 217, 217, 716, 715, 211, 713, 212, 712, 711,
- 210, 218, 218, 218, 219, 219, 219, 220, 220, 220,
- 259, 259, 259, 710, 709, 213, 260, 260, 260, 707,
- 706, 216, 261, 261, 261, 264, 264, 264, 217, 259,
- 705, 214, 262, 262, 262, 263, 263, 263, 265, 265,
- 265, 704, 261, 266, 266, 266, 260, 702, 701, 263,
- 700, 218, 263, 699, 220, 267, 267, 267, 268, 268,
- 268, 262, 269, 269, 269, 270, 270, 270, 271, 271,
-
- 271, 272, 272, 272, 273, 273, 273, 698, 697, 266,
- 274, 274, 274, 275, 275, 275, 276, 276, 276, 267,
- 277, 277, 277, 278, 278, 278, 279, 279, 279, 280,
- 280, 280, 281, 281, 281, 282, 282, 282, 273, 696,
- 695, 270, 694, 693, 274, 692, 691, 271, 688, 687,
- 272, 283, 283, 283, 686, 277, 685, 684, 276, 683,
- 279, 284, 284, 284, 281, 285, 285, 285, 286, 286,
- 286, 323, 323, 323, 325, 325, 325, 682, 280, 681,
- 680, 325, 679, 324, 324, 324, 678, 283, 329, 329,
- 329, 324, 324, 326, 326, 326, 677, 285, 676, 286,
-
- 324, 323, 675, 324, 674, 284, 672, 324, 324, 327,
- 327, 327, 671, 326, 328, 328, 328, 330, 330, 330,
- 670, 327, 331, 331, 331, 332, 332, 332, 333, 333,
- 333, 334, 334, 334, 328, 335, 335, 335, 336, 336,
- 336, 337, 337, 337, 338, 338, 338, 339, 339, 339,
- 340, 340, 340, 669, 331, 668, 667, 330, 341, 341,
- 341, 342, 342, 342, 333, 343, 343, 343, 347, 666,
- 332, 344, 344, 344, 381, 381, 381, 386, 386, 386,
- 334, 665, 664, 347, 347, 663, 336, 662, 347, 661,
- 382, 382, 382, 660, 386, 341, 382, 342, 381, 340,
-
- 383, 383, 383, 384, 384, 384, 659, 343, 385, 385,
- 385, 387, 387, 387, 383, 385, 658, 384, 657, 656,
- 344, 388, 388, 388, 389, 389, 389, 390, 390, 390,
- 655, 389, 391, 391, 391, 654, 388, 387, 392, 392,
- 392, 387, 393, 393, 393, 650, 390, 394, 394, 394,
- 395, 395, 395, 396, 396, 396, 649, 391, 397, 397,
- 397, 398, 398, 398, 399, 399, 399, 400, 400, 400,
- 401, 401, 401, 402, 402, 402, 393, 648, 442, 442,
- 442, 443, 443, 443, 444, 444, 444, 392, 647, 396,
- 646, 645, 444, 644, 394, 442, 643, 398, 443, 445,
-
- 445, 445, 400, 446, 446, 446, 447, 447, 447, 448,
- 448, 448, 449, 449, 449, 450, 450, 450, 446, 642,
- 447, 640, 638, 445, 637, 450, 451, 451, 451, 636,
- 448, 635, 634, 449, 452, 452, 452, 453, 453, 453,
- 452, 451, 454, 454, 454, 455, 455, 455, 456, 456,
- 456, 457, 457, 457, 458, 458, 458, 459, 459, 459,
- 499, 499, 499, 633, 632, 500, 500, 500, 453, 501,
- 501, 501, 502, 502, 502, 503, 503, 503, 631, 630,
- 499, 455, 500, 623, 622, 503, 457, 504, 504, 504,
- 505, 505, 505, 620, 501, 504, 619, 502, 506, 506,
-
- 506, 507, 507, 507, 508, 508, 508, 505, 506, 507,
- 509, 509, 509, 510, 510, 510, 511, 511, 511, 618,
- 617, 510, 510, 512, 512, 512, 615, 509, 545, 545,
- 545, 546, 546, 546, 614, 508, 610, 546, 547, 547,
- 547, 548, 548, 548, 549, 549, 549, 550, 550, 550,
- 609, 608, 549, 545, 551, 551, 551, 550, 552, 552,
- 552, 553, 553, 553, 551, 554, 554, 554, 555, 555,
- 555, 607, 606, 554, 554, 556, 556, 556, 557, 557,
- 557, 587, 587, 587, 605, 604, 553, 588, 588, 588,
- 603, 602, 557, 601, 588, 556, 589, 589, 589, 590,
-
- 590, 590, 591, 591, 591, 592, 592, 592, 593, 593,
- 593, 594, 594, 594, 595, 595, 595, 596, 596, 596,
- 600, 589, 624, 624, 624, 594, 599, 598, 593, 625,
- 625, 625, 586, 595, 626, 626, 626, 585, 584, 624,
- 583, 596, 627, 627, 627, 628, 628, 628, 629, 629,
- 629, 581, 580, 626, 651, 651, 651, 652, 652, 652,
- 653, 653, 653, 579, 651, 577, 627, 673, 673, 673,
- 776, 776, 776, 776, 777, 777, 777, 777, 778, 778,
- 778, 778, 779, 779, 779, 779, 780, 780, 781, 781,
- 782, 576, 782, 782, 575, 574, 573, 572, 571, 570,
-
- 569, 568, 565, 564, 563, 562, 561, 560, 559, 558,
- 544, 542, 539, 538, 537, 536, 535, 534, 533, 532,
- 531, 530, 529, 528, 527, 525, 524, 522, 521, 520,
- 519, 518, 517, 516, 515, 514, 513, 498, 497, 496,
- 495, 494, 492, 491, 490, 489, 488, 487, 486, 485,
- 484, 483, 482, 481, 480, 479, 475, 474, 472, 471,
- 468, 467, 465, 464, 463, 462, 461, 441, 440, 439,
- 438, 437, 436, 435, 434, 433, 432, 431, 430, 429,
- 428, 427, 425, 424, 423, 422, 421, 419, 418, 417,
- 416, 415, 414, 413, 412, 411, 410, 409, 408, 407,
-
- 406, 405, 404, 403, 380, 379, 378, 377, 376, 375,
+ 777, 137, 147, 147, 147, 148, 148, 148, 776, 138,
+ 775, 139, 478, 774, 141, 149, 149, 149, 478, 140,
+ 150, 150, 150, 773, 142, 151, 151, 151, 152, 152,
+ 152, 772, 153, 153, 153, 255, 771, 143, 191, 191,
+ 144, 148, 255, 146, 145, 770, 191, 147, 192, 192,
+
+ 192, 149, 194, 194, 194, 193, 193, 193, 574, 574,
+ 150, 193, 768, 152, 153, 195, 195, 195, 196, 196,
+ 196, 767, 191, 766, 151, 765, 193, 193, 193, 193,
+ 197, 197, 197, 198, 198, 198, 199, 199, 199, 763,
+ 200, 200, 200, 762, 761, 201, 201, 201, 202, 202,
+ 202, 203, 203, 203, 204, 204, 204, 205, 205, 205,
+ 206, 206, 206, 207, 207, 207, 196, 208, 208, 208,
+ 209, 209, 209, 760, 759, 198, 210, 210, 210, 197,
+ 200, 201, 211, 211, 211, 212, 212, 212, 757, 205,
+ 756, 754, 206, 213, 213, 213, 753, 202, 752, 207,
+
+ 751, 750, 204, 214, 214, 214, 749, 208, 210, 215,
+ 215, 215, 210, 216, 216, 216, 217, 217, 217, 209,
+ 218, 218, 218, 748, 747, 212, 746, 213, 745, 744,
+ 211, 219, 219, 219, 220, 220, 220, 221, 221, 221,
+ 263, 263, 263, 742, 741, 214, 264, 264, 264, 740,
+ 739, 217, 265, 265, 265, 268, 268, 268, 218, 263,
+ 737, 215, 266, 266, 266, 267, 267, 267, 269, 269,
+ 269, 736, 265, 270, 270, 270, 264, 735, 734, 267,
+ 732, 219, 267, 731, 221, 271, 271, 271, 272, 272,
+ 272, 266, 273, 273, 273, 274, 274, 274, 275, 275,
+
+ 275, 276, 276, 276, 277, 277, 277, 730, 729, 270,
+ 278, 278, 278, 279, 279, 279, 280, 280, 280, 271,
+ 281, 281, 281, 282, 282, 282, 283, 283, 283, 284,
+ 284, 284, 285, 285, 285, 286, 286, 286, 277, 728,
+ 726, 274, 725, 724, 278, 723, 722, 275, 720, 719,
+ 276, 287, 287, 287, 718, 281, 717, 716, 280, 715,
+ 283, 288, 288, 288, 285, 289, 289, 289, 290, 290,
+ 290, 328, 328, 328, 330, 330, 330, 714, 284, 713,
+ 712, 330, 711, 329, 329, 329, 710, 287, 334, 334,
+ 334, 329, 329, 331, 331, 331, 709, 289, 708, 290,
+
+ 329, 328, 707, 329, 705, 288, 704, 329, 329, 332,
+ 332, 332, 703, 331, 333, 333, 333, 335, 335, 335,
+ 702, 332, 336, 336, 336, 337, 337, 337, 338, 338,
+ 338, 339, 339, 339, 333, 340, 340, 340, 341, 341,
+ 341, 342, 342, 342, 343, 343, 343, 344, 344, 344,
+ 345, 345, 345, 701, 336, 700, 699, 335, 346, 346,
+ 346, 347, 347, 347, 338, 348, 348, 348, 352, 698,
+ 337, 349, 349, 349, 387, 387, 387, 392, 392, 392,
+ 339, 697, 696, 352, 352, 695, 341, 694, 352, 693,
+ 388, 388, 388, 692, 392, 346, 388, 347, 387, 345,
+
+ 389, 389, 389, 390, 390, 390, 691, 348, 391, 391,
+ 391, 393, 393, 393, 389, 391, 690, 390, 689, 688,
+ 349, 394, 394, 394, 395, 395, 395, 396, 396, 396,
+ 686, 395, 397, 397, 397, 685, 394, 393, 398, 398,
+ 398, 393, 399, 399, 399, 684, 396, 400, 400, 400,
+ 401, 401, 401, 402, 402, 402, 683, 397, 403, 403,
+ 403, 404, 404, 404, 405, 405, 405, 406, 406, 406,
+ 407, 407, 407, 408, 408, 408, 399, 682, 449, 449,
+ 449, 450, 450, 450, 451, 451, 451, 398, 681, 402,
+ 680, 679, 451, 678, 400, 449, 677, 404, 450, 452,
+
+ 452, 452, 406, 453, 453, 453, 454, 454, 454, 455,
+ 455, 455, 456, 456, 456, 457, 457, 457, 453, 676,
+ 454, 675, 674, 452, 673, 457, 458, 458, 458, 672,
+ 455, 671, 670, 456, 459, 459, 459, 460, 460, 460,
+ 459, 458, 461, 461, 461, 462, 462, 462, 463, 463,
+ 463, 464, 464, 464, 465, 465, 465, 466, 466, 466,
+ 506, 506, 506, 669, 668, 507, 507, 507, 460, 508,
+ 508, 508, 509, 509, 509, 510, 510, 510, 667, 666,
+ 506, 462, 507, 662, 661, 510, 464, 511, 511, 511,
+ 512, 512, 512, 660, 508, 511, 659, 509, 513, 513,
+
+ 513, 514, 514, 514, 515, 515, 515, 512, 513, 514,
+ 516, 516, 516, 517, 517, 517, 518, 518, 518, 658,
+ 657, 517, 517, 519, 519, 519, 656, 516, 553, 553,
+ 553, 554, 554, 554, 655, 515, 654, 554, 555, 555,
+ 555, 556, 556, 556, 557, 557, 557, 558, 558, 558,
+ 652, 650, 557, 553, 559, 559, 559, 558, 560, 560,
+ 560, 561, 561, 561, 559, 562, 562, 562, 563, 563,
+ 563, 649, 648, 562, 562, 564, 564, 564, 565, 565,
+ 565, 596, 596, 596, 647, 646, 561, 597, 597, 597,
+ 645, 644, 565, 643, 597, 564, 598, 598, 598, 599,
+
+ 599, 599, 600, 600, 600, 601, 601, 601, 602, 602,
+ 602, 603, 603, 603, 604, 604, 604, 605, 605, 605,
+ 642, 598, 634, 634, 634, 603, 641, 640, 602, 635,
+ 635, 635, 633, 604, 636, 636, 636, 632, 631, 634,
+ 630, 605, 637, 637, 637, 638, 638, 638, 639, 639,
+ 639, 629, 627, 636, 663, 663, 663, 664, 664, 664,
+ 665, 665, 665, 626, 663, 622, 637, 687, 687, 687,
+ 802, 802, 802, 802, 803, 803, 803, 803, 804, 804,
+ 804, 804, 805, 805, 805, 805, 806, 806, 807, 807,
+ 808, 621, 808, 808, 620, 619, 618, 617, 616, 615,
+
+ 614, 613, 612, 611, 610, 609, 608, 607, 595, 594,
+ 592, 591, 590, 588, 587, 586, 585, 584, 583, 582,
+ 581, 580, 579, 578, 576, 575, 573, 572, 571, 570,
+ 569, 568, 567, 566, 552, 550, 547, 546, 545, 544,
+ 543, 542, 541, 540, 539, 538, 537, 535, 534, 533,
+ 531, 530, 529, 528, 527, 526, 525, 524, 523, 522,
+ 521, 520, 505, 504, 503, 502, 501, 499, 498, 497,
+ 496, 495, 494, 493, 492, 491, 490, 489, 488, 486,
+ 483, 482, 480, 479, 475, 474, 472, 471, 470, 469,
+ 468, 448, 447, 446, 445, 444, 443, 442, 441, 440,
+
+ 439, 437, 436, 435, 433, 432, 431, 430, 429, 428,
+ 426, 425, 424, 423, 422, 421, 420, 419, 418, 417,
+ 416, 415, 414, 413, 412, 411, 410, 409, 386, 385,
+ 384, 383, 382, 381, 380, 379, 378, 377, 376, 375,
374, 373, 372, 371, 370, 369, 368, 367, 366, 365,
364, 363, 362, 361, 360, 359, 358, 357, 356, 355,
- 354, 353, 352, 351, 350, 349, 348, 346, 345, 322,
- 321, 319, 318, 317, 316, 315, 314, 313, 312, 311,
+ 354, 353, 351, 350, 327, 326, 324, 323, 322, 321,
+ 320, 319, 318, 317, 316, 315, 314, 313, 312, 311,
310, 309, 308, 307, 306, 305, 304, 303, 302, 301,
300, 299, 298, 297, 296, 295, 294, 293, 292, 291,
- 290, 289, 288, 287, 257, 256, 255, 254, 253, 251,
- 249, 248, 247, 246, 245, 244, 243, 242, 241, 240,
- 239, 238, 237, 236, 235, 234, 233, 230, 228, 227,
-
- 226, 225, 224, 223, 222, 189, 188, 187, 186, 185,
- 184, 183, 182, 181, 180, 179, 178, 177, 176, 175,
- 173, 172, 171, 169, 167, 165, 164, 162, 161, 160,
- 159, 158, 157, 113, 112, 111, 108, 106, 104, 101,
- 99, 97, 96, 45, 42, 37, 18, 7, 3, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
-
- 775, 775, 775, 775, 775, 775, 775, 775, 775, 775,
- 775, 775, 775, 775, 775
+
+ 261, 260, 259, 258, 257, 256, 254, 253, 252, 251,
+ 250, 249, 248, 247, 246, 245, 244, 243, 242, 241,
+ 240, 239, 238, 237, 236, 233, 232, 230, 229, 228,
+ 227, 226, 225, 224, 223, 190, 189, 188, 187, 186,
+ 185, 184, 183, 182, 180, 179, 178, 177, 175, 173,
+ 171, 169, 167, 166, 165, 163, 162, 161, 160, 159,
+ 155, 113, 112, 111, 109, 108, 106, 104, 101, 97,
+ 96, 45, 42, 37, 18, 7, 3, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801, 801, 801, 801, 801, 801, 801, 801,
+ 801, 801, 801
} ;
static yy_state_type yy_last_accepting_state;
@@ -1089,7 +1105,7 @@ char *yytext;
/*
* The SIP lexer.
*
- * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
+ * Copyright (c) 2009 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -1136,7 +1152,7 @@ static FILE *openFile(const char *);
static void fatallex(char *);
-#line 1140 "lexer.c.tmp"
+#line 1156 "lexer.c.tmp"
#define INITIAL 0
#define code 1
@@ -1297,7 +1313,7 @@ YY_DECL
#line 55 "lexer.l"
-#line 1301 "lexer.c.tmp"
+#line 1317 "lexer.c.tmp"
if ( !(yy_init) )
{
@@ -1351,13 +1367,13 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 776 )
+ if ( yy_current_state >= 802 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
- while ( yy_base[yy_current_state] != 1650 );
+ while ( yy_base[yy_current_state] != 1678 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
@@ -1384,344 +1400,349 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
#line 57 "lexer.l"
-{return TK_OPTIONS;}
+{return TK_PLUGIN;}
YY_BREAK
case 2:
YY_RULE_SETUP
#line 58 "lexer.l"
-{return TK_NOEMITTERS;}
+{return TK_INCLUDE;}
YY_BREAK
case 3:
YY_RULE_SETUP
#line 59 "lexer.l"
-{return TK_INCLUDE;}
+{return TK_OPTINCLUDE;}
YY_BREAK
case 4:
YY_RULE_SETUP
#line 60 "lexer.l"
-{return TK_OPTINCLUDE;}
+{return TK_IMPORT;}
YY_BREAK
case 5:
YY_RULE_SETUP
#line 61 "lexer.l"
-{return TK_IMPORT;}
+{return TK_MODULE;}
YY_BREAK
case 6:
YY_RULE_SETUP
#line 62 "lexer.l"
-{return TK_MODULE;}
+{return TK_CMODULE;}
YY_BREAK
case 7:
YY_RULE_SETUP
#line 63 "lexer.l"
-{return TK_CMODULE;}
+{return TK_CONSMODULE;}
YY_BREAK
case 8:
YY_RULE_SETUP
#line 64 "lexer.l"
-{return TK_CONSMODULE;}
+{return TK_COMPOMODULE;}
YY_BREAK
case 9:
YY_RULE_SETUP
#line 65 "lexer.l"
-{return TK_COMPOMODULE;}
+{return TK_TIMELINE;}
YY_BREAK
case 10:
YY_RULE_SETUP
#line 66 "lexer.l"
-{return TK_TIMELINE;}
+{return TK_PLATFORMS;}
YY_BREAK
case 11:
YY_RULE_SETUP
#line 67 "lexer.l"
-{return TK_PLATFORMS;}
+{return TK_FEATURE;}
YY_BREAK
case 12:
YY_RULE_SETUP
#line 68 "lexer.l"
-{return TK_FEATURE;}
+{return TK_LICENSE;}
YY_BREAK
case 13:
YY_RULE_SETUP
#line 69 "lexer.l"
-{return TK_LICENSE;}
+{return TK_MAPPEDTYPE;}
YY_BREAK
case 14:
YY_RULE_SETUP
#line 70 "lexer.l"
-{return TK_MAPPEDTYPE;}
+{return TK_EXCEPTION;}
YY_BREAK
case 15:
YY_RULE_SETUP
#line 71 "lexer.l"
-{return TK_EXCEPTION;}
+{return TK_IF;}
YY_BREAK
case 16:
YY_RULE_SETUP
#line 72 "lexer.l"
-{return TK_IF;}
+{return TK_DEFMETATYPE;}
YY_BREAK
case 17:
YY_RULE_SETUP
#line 73 "lexer.l"
-{return TK_END;}
+{return TK_DEFSUPERTYPE;}
YY_BREAK
case 18:
YY_RULE_SETUP
#line 74 "lexer.l"
-{return TK_CLASS;}
+{return TK_END;}
YY_BREAK
case 19:
YY_RULE_SETUP
#line 75 "lexer.l"
-{return TK_STRUCT;}
+{return TK_CLASS;}
YY_BREAK
case 20:
YY_RULE_SETUP
#line 76 "lexer.l"
-{return TK_PUBLIC;}
+{return TK_STRUCT;}
YY_BREAK
case 21:
YY_RULE_SETUP
#line 77 "lexer.l"
-{return TK_PROTECTED;}
+{return TK_PUBLIC;}
YY_BREAK
case 22:
YY_RULE_SETUP
#line 78 "lexer.l"
-{return TK_PRIVATE;}
+{return TK_PROTECTED;}
YY_BREAK
case 23:
YY_RULE_SETUP
#line 79 "lexer.l"
-{return TK_SIGNALS;}
+{return TK_PRIVATE;}
YY_BREAK
case 24:
YY_RULE_SETUP
#line 80 "lexer.l"
-{return TK_SLOTS;}
+{return TK_SIGNALS;}
YY_BREAK
case 25:
YY_RULE_SETUP
#line 81 "lexer.l"
-{return TK_CHAR;}
+{return TK_SLOTS;}
YY_BREAK
case 26:
YY_RULE_SETUP
#line 82 "lexer.l"
-{return TK_WCHAR_T;}
+{return TK_CHAR;}
YY_BREAK
case 27:
YY_RULE_SETUP
#line 83 "lexer.l"
-{return TK_BOOL;}
+{return TK_WCHAR_T;}
YY_BREAK
case 28:
YY_RULE_SETUP
#line 84 "lexer.l"
-{return TK_SHORT;}
+{return TK_BOOL;}
YY_BREAK
case 29:
YY_RULE_SETUP
#line 85 "lexer.l"
-{return TK_INT;}
+{return TK_SHORT;}
YY_BREAK
case 30:
YY_RULE_SETUP
#line 86 "lexer.l"
-{return TK_LONG;}
+{return TK_INT;}
YY_BREAK
case 31:
YY_RULE_SETUP
#line 87 "lexer.l"
-{return TK_FLOAT;}
+{return TK_LONG;}
YY_BREAK
case 32:
YY_RULE_SETUP
#line 88 "lexer.l"
-{return TK_DOUBLE;}
+{return TK_FLOAT;}
YY_BREAK
case 33:
YY_RULE_SETUP
#line 89 "lexer.l"
-{return TK_VOID;}
+{return TK_DOUBLE;}
YY_BREAK
case 34:
YY_RULE_SETUP
#line 90 "lexer.l"
-{return TK_VIRTUAL;}
+{return TK_VOID;}
YY_BREAK
case 35:
YY_RULE_SETUP
#line 91 "lexer.l"
-{return TK_ENUM;}
+{return TK_VIRTUAL;}
YY_BREAK
case 36:
YY_RULE_SETUP
#line 92 "lexer.l"
-{return TK_SIGNED;}
+{return TK_ENUM;}
YY_BREAK
case 37:
YY_RULE_SETUP
#line 93 "lexer.l"
-{return TK_UNSIGNED;}
+{return TK_SIGNED;}
YY_BREAK
case 38:
YY_RULE_SETUP
#line 94 "lexer.l"
-{return TK_CONST;}
+{return TK_UNSIGNED;}
YY_BREAK
case 39:
YY_RULE_SETUP
#line 95 "lexer.l"
-{return TK_STATIC;}
+{return TK_CONST;}
YY_BREAK
case 40:
YY_RULE_SETUP
#line 96 "lexer.l"
-{return TK_TRUE;}
+{return TK_STATIC;}
YY_BREAK
case 41:
YY_RULE_SETUP
#line 97 "lexer.l"
-{return TK_FALSE;}
+{return TK_TRUE;}
YY_BREAK
case 42:
YY_RULE_SETUP
#line 98 "lexer.l"
-{return TK_NULL;}
+{return TK_FALSE;}
YY_BREAK
case 43:
YY_RULE_SETUP
#line 99 "lexer.l"
-{return TK_TYPEDEF;}
+{return TK_NULL;}
YY_BREAK
case 44:
YY_RULE_SETUP
#line 100 "lexer.l"
-{return TK_NAMESPACE;}
+{return TK_TYPEDEF;}
YY_BREAK
case 45:
YY_RULE_SETUP
#line 101 "lexer.l"
-{return TK_OPERATOR;}
+{return TK_NAMESPACE;}
YY_BREAK
case 46:
YY_RULE_SETUP
#line 102 "lexer.l"
-{return TK_THROW;}
+{return TK_OPERATOR;}
YY_BREAK
case 47:
YY_RULE_SETUP
#line 103 "lexer.l"
-{return TK_EXPLICIT;}
+{return TK_THROW;}
YY_BREAK
case 48:
YY_RULE_SETUP
#line 104 "lexer.l"
-{return TK_TEMPLATE;}
+{return TK_EXPLICIT;}
YY_BREAK
case 49:
YY_RULE_SETUP
#line 105 "lexer.l"
-{return TK_SCOPE;}
+{return TK_TEMPLATE;}
YY_BREAK
case 50:
YY_RULE_SETUP
#line 106 "lexer.l"
-{return TK_LOGICAL_OR;}
+{return TK_SCOPE;}
YY_BREAK
case 51:
YY_RULE_SETUP
#line 107 "lexer.l"
-{return TK_PYOBJECT;}
+{return TK_LOGICAL_OR;}
YY_BREAK
case 52:
YY_RULE_SETUP
#line 108 "lexer.l"
-{return TK_PYTUPLE;}
+{return TK_PYOBJECT;}
YY_BREAK
case 53:
YY_RULE_SETUP
#line 109 "lexer.l"
-{return TK_PYLIST;}
+{return TK_PYTUPLE;}
YY_BREAK
case 54:
YY_RULE_SETUP
#line 110 "lexer.l"
-{return TK_PYDICT;}
+{return TK_PYLIST;}
YY_BREAK
case 55:
YY_RULE_SETUP
#line 111 "lexer.l"
-{return TK_PYCALLABLE;}
+{return TK_PYDICT;}
YY_BREAK
case 56:
YY_RULE_SETUP
#line 112 "lexer.l"
-{return TK_PYSLICE;}
+{return TK_PYCALLABLE;}
YY_BREAK
case 57:
YY_RULE_SETUP
#line 113 "lexer.l"
-{return TK_PYTYPE;}
+{return TK_PYSLICE;}
YY_BREAK
case 58:
YY_RULE_SETUP
#line 114 "lexer.l"
-{return TK_SIPSIGNAL;}
+{return TK_PYTYPE;}
YY_BREAK
case 59:
YY_RULE_SETUP
#line 115 "lexer.l"
-{return TK_SIPSLOT;}
+{return TK_SIPSIGNAL;}
YY_BREAK
case 60:
YY_RULE_SETUP
#line 116 "lexer.l"
-{return TK_SIPANYSLOT;}
+{return TK_SIPSLOT;}
YY_BREAK
case 61:
YY_RULE_SETUP
#line 117 "lexer.l"
-{return TK_SIPRXCON;}
+{return TK_SIPANYSLOT;}
YY_BREAK
case 62:
YY_RULE_SETUP
#line 118 "lexer.l"
-{return TK_SIPRXDIS;}
+{return TK_SIPRXCON;}
YY_BREAK
case 63:
YY_RULE_SETUP
#line 119 "lexer.l"
-{return TK_SIPSLOTCON;}
+{return TK_SIPRXDIS;}
YY_BREAK
case 64:
YY_RULE_SETUP
#line 120 "lexer.l"
-{return TK_SIPSLOTDIS;}
+{return TK_SIPSLOTCON;}
YY_BREAK
case 65:
YY_RULE_SETUP
#line 121 "lexer.l"
-{return TK_QOBJECT;}
+{return TK_SIPSLOTDIS;}
YY_BREAK
case 66:
YY_RULE_SETUP
#line 122 "lexer.l"
-{return TK_ELLIPSIS;}
+{return TK_QOBJECT;}
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 125 "lexer.l"
+#line 123 "lexer.l"
+{return TK_ELLIPSIS;}
+ YY_BREAK
+case 68:
+YY_RULE_SETUP
+#line 126 "lexer.l"
{ /* Ignore whitespace. */
;
}
YY_BREAK
-case 68:
-/* rule 68 can match eol */
+case 69:
+/* rule 69 can match eol */
YY_RULE_SETUP
-#line 129 "lexer.l"
+#line 130 "lexer.l"
{ /* Maintain the line number. */
++inputFileStack[currentFile].lineno;
@@ -1731,57 +1752,57 @@ YY_RULE_SETUP
}
}
YY_BREAK
-case 69:
+case 70:
YY_RULE_SETUP
-#line 138 "lexer.l"
+#line 139 "lexer.l"
{ /* Ignore C++ style comments. */
;
}
YY_BREAK
-case 70:
+case 71:
YY_RULE_SETUP
-#line 143 "lexer.l"
+#line 144 "lexer.l"
{ /* A signed decimal number. */
yylval.number = strtol(yytext,NULL,0);
return TK_NUMBER;
}
YY_BREAK
-case 71:
+case 72:
YY_RULE_SETUP
-#line 149 "lexer.l"
+#line 150 "lexer.l"
{/* A floating point number. */
yylval.real = strtod(yytext,NULL);
return TK_REAL;
}
YY_BREAK
-case 72:
+case 73:
YY_RULE_SETUP
-#line 155 "lexer.l"
+#line 156 "lexer.l"
{ /* An unsigned hexadecimal number. */
yylval.number = strtol(yytext,NULL,16);
return TK_NUMBER;
}
YY_BREAK
-case 73:
+case 74:
YY_RULE_SETUP
-#line 161 "lexer.l"
+#line 162 "lexer.l"
{ /* An identifier name. */
yylval.text = sipStrdup(yytext);
return TK_NAME;
}
YY_BREAK
-case 74:
+case 75:
YY_RULE_SETUP
-#line 167 "lexer.l"
+#line 168 "lexer.l"
{ /* A relative pathname. */
yylval.text = sipStrdup(yytext);
return TK_PATHNAME;
}
YY_BREAK
-case 75:
-/* rule 75 can match eol */
+case 76:
+/* rule 76 can match eol */
YY_RULE_SETUP
-#line 173 "lexer.l"
+#line 174 "lexer.l"
{ /* A double-quoted string. */
char *dp, *sp;
@@ -1805,10 +1826,10 @@ YY_RULE_SETUP
return TK_STRING;
}
YY_BREAK
-case 76:
-/* rule 76 can match eol */
+case 77:
+/* rule 77 can match eol */
YY_RULE_SETUP
-#line 197 "lexer.l"
+#line 198 "lexer.l"
{ /* A single-quoted character. */
if (strlen(yytext) != 3)
fatallex("Exactly one character expected between single quotes");
@@ -1818,280 +1839,288 @@ YY_RULE_SETUP
return TK_QCHAR;
}
YY_BREAK
-case 77:
+case 78:
YY_RULE_SETUP
-#line 207 "lexer.l"
+#line 208 "lexer.l"
{ /* Ignore C-style comments. */
BEGIN ccomment;
}
YY_BREAK
-case 78:
-/* rule 78 can match eol */
+case 79:
+/* rule 79 can match eol */
YY_RULE_SETUP
-#line 210 "lexer.l"
+#line 211 "lexer.l"
{
++inputFileStack[currentFile].lineno;
}
YY_BREAK
-case 79:
+case 80:
YY_RULE_SETUP
-#line 213 "lexer.l"
+#line 214 "lexer.l"
{
BEGIN INITIAL;
}
YY_BREAK
-case 80:
+case 81:
YY_RULE_SETUP
-#line 216 "lexer.l"
+#line 217 "lexer.l"
{
;
}
YY_BREAK
-case 81:
+case 82:
YY_RULE_SETUP
-#line 221 "lexer.l"
+#line 222 "lexer.l"
{ /* The software license. */
codeIdx = 0;
return TK_COPYING;
}
YY_BREAK
-case 82:
+case 83:
YY_RULE_SETUP
-#line 226 "lexer.l"
+#line 227 "lexer.l"
{ /* The start of a from-type code block. */
codeIdx = 0;
return TK_FROMTYPE;
}
YY_BREAK
-case 83:
+case 84:
YY_RULE_SETUP
-#line 231 "lexer.l"
+#line 232 "lexer.l"
{ /* The start of a to-type code block. */
codeIdx = 0;
return TK_TOTYPE;
}
YY_BREAK
-case 84:
+case 85:
YY_RULE_SETUP
-#line 236 "lexer.l"
+#line 237 "lexer.l"
{ /* The start of a to-sub-class code block. */
codeIdx = 0;
return TK_TOSUBCLASS;
}
YY_BREAK
-case 85:
+case 86:
YY_RULE_SETUP
-#line 241 "lexer.l"
+#line 242 "lexer.l"
{ /* The start of an exported header code block. */
codeIdx = 0;
return TK_EXPHEADERCODE;
}
YY_BREAK
-case 86:
+case 87:
YY_RULE_SETUP
-#line 246 "lexer.l"
+#line 247 "lexer.l"
{ /* The start of a module header code block. */
codeIdx = 0;
return TK_MODHEADERCODE;
}
YY_BREAK
-case 87:
+case 88:
YY_RULE_SETUP
-#line 251 "lexer.l"
+#line 252 "lexer.l"
{ /* The start of a type header code block. */
codeIdx = 0;
return TK_TYPEHEADERCODE;
}
YY_BREAK
-case 88:
+case 89:
YY_RULE_SETUP
-#line 256 "lexer.l"
+#line 257 "lexer.l"
{ /* The start of a pre-initialisation code block. */
codeIdx = 0;
return TK_PREINITCODE;
}
YY_BREAK
-case 89:
+case 90:
YY_RULE_SETUP
-#line 261 "lexer.l"
+#line 262 "lexer.l"
+{ /* The start of an initialisation code block. */
+ codeIdx = 0;
+ return TK_INITCODE;
+}
+ YY_BREAK
+case 91:
+YY_RULE_SETUP
+#line 267 "lexer.l"
{ /* The start of a post-initialisation code block. */
codeIdx = 0;
return TK_POSTINITCODE;
}
YY_BREAK
-case 90:
+case 92:
YY_RULE_SETUP
-#line 266 "lexer.l"
+#line 272 "lexer.l"
{ /* The start of a unit code block. */
codeIdx = 0;
return TK_UNITCODE;
}
YY_BREAK
-case 91:
+case 93:
YY_RULE_SETUP
-#line 271 "lexer.l"
+#line 277 "lexer.l"
{ /* The start of a module code block. */
codeIdx = 0;
return TK_MODCODE;
}
YY_BREAK
-case 92:
+case 94:
YY_RULE_SETUP
-#line 276 "lexer.l"
+#line 282 "lexer.l"
{ /* The start of a type code block. */
codeIdx = 0;
return TK_TYPECODE;
}
YY_BREAK
-case 93:
+case 95:
YY_RULE_SETUP
-#line 281 "lexer.l"
+#line 287 "lexer.l"
{ /* The start of a C++ method code block. */
codeIdx = 0;
return TK_METHODCODE;
}
YY_BREAK
-case 94:
+case 96:
YY_RULE_SETUP
-#line 286 "lexer.l"
+#line 292 "lexer.l"
{ /* The start of a C++ virtual code block. */
codeIdx = 0;
return TK_VIRTUALCATCHERCODE;
}
YY_BREAK
-case 95:
+case 97:
YY_RULE_SETUP
-#line 291 "lexer.l"
+#line 297 "lexer.l"
{ /* The start of a traverse code block. */
codeIdx = 0;
return TK_TRAVERSECODE;
}
YY_BREAK
-case 96:
+case 98:
YY_RULE_SETUP
-#line 296 "lexer.l"
+#line 302 "lexer.l"
{ /* The start of a clear code block. */
codeIdx = 0;
return TK_CLEARCODE;
}
YY_BREAK
-case 97:
+case 99:
YY_RULE_SETUP
-#line 301 "lexer.l"
+#line 307 "lexer.l"
{ /* The start of a read buffer code block. */
codeIdx = 0;
return TK_READBUFFERCODE;
}
YY_BREAK
-case 98:
+case 100:
YY_RULE_SETUP
-#line 306 "lexer.l"
+#line 312 "lexer.l"
{ /* The start of a write buffer code block. */
codeIdx = 0;
return TK_WRITEBUFFERCODE;
}
YY_BREAK
-case 99:
+case 101:
YY_RULE_SETUP
-#line 311 "lexer.l"
+#line 317 "lexer.l"
{ /* The start of a segment count code block. */
codeIdx = 0;
return TK_SEGCOUNTCODE;
}
YY_BREAK
-case 100:
+case 102:
YY_RULE_SETUP
-#line 316 "lexer.l"
+#line 322 "lexer.l"
{ /* The start of a char buffer code block. */
codeIdx = 0;
return TK_CHARBUFFERCODE;
}
YY_BREAK
-case 101:
+case 103:
YY_RULE_SETUP
-#line 321 "lexer.l"
+#line 327 "lexer.l"
{ /* The start of a pickle code block. */
codeIdx = 0;
return TK_PICKLECODE;
}
YY_BREAK
-case 102:
+case 104:
YY_RULE_SETUP
-#line 326 "lexer.l"
+#line 332 "lexer.l"
{ /* The start of a pre-Python code block. */
codeIdx = 0;
return TK_PREPYCODE;
}
YY_BREAK
-case 103:
+case 105:
YY_RULE_SETUP
-#line 331 "lexer.l"
+#line 337 "lexer.l"
{ /* The start of a raise exception code block. */
codeIdx = 0;
return TK_RAISECODE;
}
YY_BREAK
-case 104:
+case 106:
YY_RULE_SETUP
-#line 336 "lexer.l"
+#line 342 "lexer.l"
{ /* The start of a documentation block. */
codeIdx = 0;
return TK_DOC;
}
YY_BREAK
-case 105:
+case 107:
YY_RULE_SETUP
-#line 341 "lexer.l"
+#line 347 "lexer.l"
{ /* The start of an exported documentation block. */
codeIdx = 0;
return TK_EXPORTEDDOC;
}
YY_BREAK
-case 106:
+case 108:
YY_RULE_SETUP
-#line 346 "lexer.l"
+#line 352 "lexer.l"
{ /* The start of a Makefile code block. */
codeIdx = 0;
return TK_MAKEFILE;
}
YY_BREAK
-case 107:
+case 109:
YY_RULE_SETUP
-#line 351 "lexer.l"
+#line 357 "lexer.l"
{ /* The start of an access code block. */
codeIdx = 0;
return TK_ACCESSCODE;
}
YY_BREAK
-case 108:
+case 110:
YY_RULE_SETUP
-#line 356 "lexer.l"
+#line 362 "lexer.l"
{ /* The start of a get code block. */
codeIdx = 0;
return TK_GETCODE;
}
YY_BREAK
-case 109:
+case 111:
YY_RULE_SETUP
-#line 361 "lexer.l"
+#line 367 "lexer.l"
{ /* The start of a set code block. */
codeIdx = 0;
return TK_SETCODE;
}
YY_BREAK
-case 110:
+case 112:
YY_RULE_SETUP
-#line 366 "lexer.l"
+#line 372 "lexer.l"
{ /* The end of a code block. */
BEGIN INITIAL;
codeIdx = -1;
return TK_END;
}
YY_BREAK
-case 111:
-/* rule 111 can match eol */
+case 113:
+/* rule 113 can match eol */
YY_RULE_SETUP
-#line 372 "lexer.l"
+#line 378 "lexer.l"
{ /* The end of a code line . */
struct inputFile *ifp;
@@ -2111,9 +2140,9 @@ YY_RULE_SETUP
return TK_CODELINE;
}
YY_BREAK
-case 112:
+case 114:
YY_RULE_SETUP
-#line 391 "lexer.l"
+#line 397 "lexer.l"
{ /* The contents of a code line. */
if (codeIdx == MAX_CODE_LINE_LENGTH)
fatallex("Line is too long");
@@ -2121,19 +2150,19 @@ YY_RULE_SETUP
codeLine[codeIdx++] = yytext[0];
}
YY_BREAK
-case 113:
+case 115:
YY_RULE_SETUP
-#line 398 "lexer.l"
+#line 404 "lexer.l"
{ /* Anything else is returned as is. */
return yytext[0];
}
YY_BREAK
-case 114:
+case 116:
YY_RULE_SETUP
-#line 402 "lexer.l"
+#line 408 "lexer.l"
ECHO;
YY_BREAK
-#line 2137 "lexer.c.tmp"
+#line 2166 "lexer.c.tmp"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(code):
case YY_STATE_EOF(ccomment):
@@ -2420,7 +2449,7 @@ static int yy_get_next_buffer (void)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 776 )
+ if ( yy_current_state >= 802 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2448,11 +2477,11 @@ static int yy_get_next_buffer (void)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 776 )
+ if ( yy_current_state >= 802 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 775);
+ yy_is_jam = (yy_current_state == 801);
return yy_is_jam ? 0 : yy_current_state;
}
@@ -3134,7 +3163,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 402 "lexer.l"
+#line 408 "lexer.l"
sipgen/lexer.c
@@ -1,7 +1,7 @@
/*
* The SIP lexer.
*
- * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
+ * Copyright (c) 2009 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -54,8 +54,7 @@ static void fatallex(char *);
%%
-^[ \t]*%SIPOptions {return TK_OPTIONS;}
-^[ \t]*%SIPNoEmitters {return TK_NOEMITTERS;}
+^[ \t]*%Plugin {return TK_PLUGIN;}
^[ \t]*%Include {return TK_INCLUDE;}
^[ \t]*%OptionalInclude {return TK_OPTINCLUDE;}
^[ \t]*%Import {return TK_IMPORT;}
@@ -70,6 +69,8 @@ static void fatallex(char *);
^[ \t]*%MappedType {return TK_MAPPEDTYPE;}
^[ \t]*%Exception {return TK_EXCEPTION;}
^[ \t]*%If {return TK_IF;}
+^[ \t]*%DefaultMetatype {return TK_DEFMETATYPE;}
+^[ \t]*%DefaultSupertype {return TK_DEFSUPERTYPE;}
<INITIAL>^[ \t]*%End {return TK_END;}
class {return TK_CLASS;}
struct {return TK_STRUCT;}
@@ -258,6 +259,11 @@ SIP_QOBJECT {return TK_QOBJECT;}
return TK_PREINITCODE;
}
+^%InitialisationCode { /* The start of an initialisation code block. */
+ codeIdx = 0;
+ return TK_INITCODE;
+}
+
^%PostInitialisationCode { /* The start of a post-initialisation code block. */
codeIdx = 0;
return TK_POSTINITCODE;
sipgen/lexer.l
@@ -1,7 +1,7 @@
/*
* The main module for SIP.
*
- * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
+ * Copyright (c) 2009 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -26,7 +26,7 @@
#define PACKAGE "sip"
#endif
-#define VERSION "4.7.8-snapshot-20081102"
+#define VERSION "4.8-snapshot-20090225"
/* Global variables - see sip.h for their meaning. */
sipgen/main.c
@@ -53,15 +53,15 @@
/* Put the tokens into the symbol table, so that GDB and other debuggers
know about them. */
enum yytokentype {
- TK_OPTIONS = 258,
- TK_NOEMITTERS = 259,
- TK_DOC = 260,
- TK_EXPORTEDDOC = 261,
- TK_MAKEFILE = 262,
- TK_ACCESSCODE = 263,
- TK_GETCODE = 264,
- TK_SETCODE = 265,
- TK_PREINITCODE = 266,
+ TK_PLUGIN = 258,
+ TK_DOC = 259,
+ TK_EXPORTEDDOC = 260,
+ TK_MAKEFILE = 261,
+ TK_ACCESSCODE = 262,
+ TK_GETCODE = 263,
+ TK_SETCODE = 264,
+ TK_PREINITCODE = 265,
+ TK_INITCODE = 266,
TK_POSTINITCODE = 267,
TK_UNITCODE = 268,
TK_MODCODE = 269,
@@ -154,18 +154,20 @@
TK_RAISECODE = 356,
TK_EXPLICIT = 357,
TK_TEMPLATE = 358,
- TK_ELLIPSIS = 359
+ TK_ELLIPSIS = 359,
+ TK_DEFMETATYPE = 360,
+ TK_DEFSUPERTYPE = 361
};
#endif
-#define TK_OPTIONS 258
-#define TK_NOEMITTERS 259
-#define TK_DOC 260
-#define TK_EXPORTEDDOC 261
-#define TK_MAKEFILE 262
-#define TK_ACCESSCODE 263
-#define TK_GETCODE 264
-#define TK_SETCODE 265
-#define TK_PREINITCODE 266
+#define TK_PLUGIN 258
+#define TK_DOC 259
+#define TK_EXPORTEDDOC 260
+#define TK_MAKEFILE 261
+#define TK_ACCESSCODE 262
+#define TK_GETCODE 263
+#define TK_SETCODE 264
+#define TK_PREINITCODE 265
+#define TK_INITCODE 266
#define TK_POSTINITCODE 267
#define TK_UNITCODE 268
#define TK_MODCODE 269
@@ -259,6 +261,8 @@
#define TK_EXPLICIT 357
#define TK_TEMPLATE 358
#define TK_ELLIPSIS 359
+#define TK_DEFMETATYPE 360
+#define TK_DEFSUPERTYPE 361
@@ -347,12 +351,12 @@ static int getDeprecated(optFlags *);
static void templateSignature(signatureDef *sd, int result, classTmplDef *tcd, templateDef *td, classDef *ncd);
static void templateType(argDef *ad, classTmplDef *tcd, templateDef *td, classDef *ncd);
static int search_back(const char *end, const char *start, const char *target);
-static char *getType(scopedNameDef *ename, argDef *ad);
+static char *type2string(argDef *ad);
static char *scopedNameToString(scopedNameDef *name);
static void addUsedFromCode(sipSpec *pt, ifaceFileList **used, const char *sname);
static int sameName(scopedNameDef *snd, const char *sname);
-static int optFind(sipSpec *pt, const char *opt);
-static void setModuleName(moduleDef *mod, const char *fullname);
+static int stringFind(stringList *sl, const char *s);
+static void setModuleName(sipSpec *pt, moduleDef *mod, const char *fullname);
static int foundInScope(scopedNameDef *fq_name, scopedNameDef *rel_name);
static void defineClass(scopedNameDef *snd);
static classDef *completeClass(scopedNameDef *snd, optFlags *of, int has_def);
@@ -368,6 +372,7 @@ static overDef *instantiateTemplateOverloads(sipSpec *pt, overDef *tod,
templateDef *td, classDef *cd, ifaceFileList **used,
scopedNameDef *type_names, scopedNameDef *type_values);
static void resolveAnyTypedef(sipSpec *pt, argDef *ad);
+static void addVariable(sipSpec *pt, varDef *vd);
/* Enabling traces. */
@@ -384,7 +389,7 @@ static void resolveAnyTypedef(sipSpec *pt, argDef *ad);
#endif
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 120 "parser.y"
+#line 121 "parser.y"
typedef union YYSTYPE {
char qchar;
char *text;
@@ -406,7 +411,7 @@ typedef union YYSTYPE {
classDef *klass;
} YYSTYPE;
/* Line 186 of yacc.c. */
-#line 410 "parser.c"
+#line 415 "parser.c"
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
@@ -418,7 +423,7 @@ typedef union YYSTYPE {
/* Line 214 of yacc.c. */
-#line 422 "parser.c"
+#line 427 "parser.c"
#if ! defined (yyoverflow) || YYERROR_VERBOSE
@@ -524,20 +529,20 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 4
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 967
+#define YYLAST 1016
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 127
+#define YYNTOKENS 129
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 138
+#define YYNNTS 139
/* YYNRULES -- Number of rules. */
-#define YYNRULES 346
+#define YYNRULES 348
/* YYNRULES -- Number of states. */
-#define YYNSTATES 582
+#define YYNSTATES 584
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 359
+#define YYMAXUTOK 361
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -548,16 +553,16 @@ static const unsigned char yytranslate[] =
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 111, 2, 2, 2, 125, 117, 2,
- 105, 106, 115, 114, 107, 112, 2, 116, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 122, 110,
- 120, 113, 121, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 112, 2, 2, 2, 127, 119, 2,
+ 110, 111, 117, 116, 114, 113, 2, 118, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 124, 109,
+ 122, 115, 123, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 123, 2, 124, 126, 2, 2, 2, 2, 2,
+ 2, 125, 2, 126, 128, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 108, 118, 109, 119, 2, 2, 2,
+ 2, 2, 2, 107, 120, 108, 121, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -580,7 +585,8 @@ static const unsigned char yytranslate[] =
65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104
+ 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
+ 105, 106
};
#if YYDEBUG
@@ -592,180 +598,180 @@ static const unsigned short int yyprhs[] =
20, 22, 24, 26, 28, 30, 32, 34, 36, 38,
40, 42, 44, 46, 48, 50, 52, 54, 56, 58,
60, 62, 64, 66, 68, 70, 72, 74, 76, 78,
- 80, 82, 84, 86, 88, 93, 95, 99, 101, 111,
- 112, 116, 119, 120, 126, 127, 133, 138, 140, 143,
- 145, 148, 151, 152, 160, 162, 165, 166, 172, 174,
- 177, 179, 182, 183, 189, 191, 194, 196, 201, 203,
- 206, 210, 215, 217, 221, 223, 226, 229, 232, 236,
- 238, 240, 242, 244, 245, 247, 250, 253, 256, 257,
- 260, 261, 264, 265, 268, 271, 274, 277, 280, 281,
- 283, 286, 289, 292, 295, 298, 301, 304, 307, 310,
- 313, 316, 319, 322, 325, 328, 333, 336, 338, 341,
- 342, 351, 352, 354, 355, 357, 358, 360, 362, 365,
- 367, 369, 374, 375, 377, 378, 381, 382, 385, 387,
- 391, 393, 395, 397, 399, 401, 403, 404, 406, 408,
- 410, 412, 415, 417, 421, 423, 425, 430, 432, 434,
- 436, 438, 440, 442, 444, 445, 447, 451, 457, 469,
- 470, 478, 479, 483, 488, 489, 497, 498, 501, 503,
- 507, 509, 510, 514, 516, 519, 521, 523, 525, 527,
- 529, 531, 533, 535, 537, 539, 541, 543, 545, 547,
- 549, 551, 553, 555, 557, 559, 562, 565, 569, 573,
- 577, 580, 581, 583, 595, 596, 600, 602, 612, 613,
- 619, 620, 627, 628, 630, 644, 659, 673, 675, 677,
- 679, 681, 683, 685, 687, 689, 692, 695, 698, 701,
- 704, 707, 710, 713, 716, 719, 723, 727, 729, 732,
- 735, 737, 740, 743, 746, 748, 751, 752, 754, 755,
- 758, 759, 763, 765, 769, 771, 775, 777, 779, 781,
- 782, 785, 786, 789, 791, 792, 794, 798, 803, 808,
- 813, 817, 821, 828, 835, 839, 842, 843, 847, 849,
- 851, 853, 854, 858, 860, 868, 873, 877, 881, 882,
- 884, 885, 888, 890, 895, 898, 901, 903, 905, 908,
- 910, 912, 915, 918, 922, 924, 926, 928, 931, 934,
- 936, 938, 940, 942, 944, 946, 948, 950, 952, 954,
- 956, 958, 962, 963, 968, 969, 971
+ 80, 82, 84, 86, 88, 90, 92, 95, 105, 106,
+ 110, 113, 114, 120, 121, 127, 132, 134, 137, 139,
+ 142, 145, 146, 154, 156, 159, 160, 166, 168, 171,
+ 173, 176, 177, 183, 185, 188, 190, 195, 197, 200,
+ 204, 209, 211, 215, 217, 220, 223, 226, 229, 232,
+ 236, 238, 240, 242, 244, 245, 247, 250, 253, 256,
+ 257, 260, 261, 264, 265, 268, 271, 274, 277, 280,
+ 281, 283, 286, 289, 292, 295, 298, 301, 304, 307,
+ 310, 313, 316, 319, 322, 325, 328, 331, 336, 339,
+ 341, 344, 345, 354, 355, 357, 358, 360, 361, 363,
+ 365, 368, 370, 372, 377, 378, 380, 381, 384, 385,
+ 388, 390, 394, 396, 398, 400, 402, 404, 406, 407,
+ 409, 411, 413, 415, 418, 420, 424, 426, 428, 433,
+ 435, 437, 439, 441, 443, 445, 447, 448, 450, 454,
+ 460, 472, 473, 481, 482, 486, 491, 492, 500, 501,
+ 504, 506, 510, 512, 513, 517, 519, 522, 524, 526,
+ 528, 530, 532, 534, 536, 538, 540, 542, 544, 546,
+ 548, 550, 552, 554, 556, 558, 560, 562, 565, 568,
+ 572, 576, 580, 583, 584, 586, 598, 599, 603, 605,
+ 615, 616, 622, 623, 630, 631, 633, 647, 662, 676,
+ 678, 680, 682, 684, 686, 688, 690, 692, 695, 698,
+ 701, 704, 707, 710, 713, 716, 719, 722, 726, 730,
+ 732, 735, 738, 740, 743, 746, 749, 751, 754, 755,
+ 757, 758, 761, 762, 766, 768, 772, 774, 778, 780,
+ 782, 784, 785, 788, 789, 792, 794, 795, 797, 801,
+ 806, 811, 816, 820, 824, 831, 838, 842, 845, 846,
+ 850, 852, 854, 856, 857, 861, 863, 871, 876, 880,
+ 884, 885, 887, 888, 891, 893, 898, 901, 904, 906,
+ 908, 911, 913, 915, 918, 921, 925, 927, 929, 931,
+ 934, 937, 939, 941, 943, 945, 947, 949, 951, 953,
+ 955, 957, 959, 961, 965, 966, 971, 972, 974
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const short int yyrhs[] =
{
- 128, 0, -1, 129, -1, 128, 129, -1, -1, 130,
- 131, -1, 165, -1, 163, -1, 164, -1, 133, -1,
- 135, -1, 175, -1, 169, -1, 170, -1, 171, -1,
- 154, -1, 149, -1, 153, -1, 162, -1, 176, -1,
- 177, -1, 187, -1, 189, -1, 190, -1, 191, -1,
- 192, -1, 193, -1, 194, -1, 195, -1, 139, -1,
- 141, -1, 132, -1, 158, -1, 161, -1, 146, -1,
- 217, -1, 222, -1, 219, -1, 136, -1, 216, -1,
- 198, -1, 238, -1, 256, -1, 178, -1, 3, 105,
- 134, 106, -1, 22, -1, 134, 107, 22, -1, 4,
- -1, 100, 212, 137, 242, 108, 179, 138, 109, 110,
- -1, -1, 105, 212, 106, -1, 101, 196, -1, -1,
- 18, 261, 242, 140, 143, -1, -1, 221, 18, 261,
- 142, 143, -1, 108, 144, 109, 110, -1, 145, -1,
- 144, 145, -1, 178, -1, 34, 196, -1, 35, 196,
- -1, -1, 88, 22, 147, 108, 148, 109, 110, -1,
- 132, -1, 148, 132, -1, -1, 90, 150, 108, 151,
- 109, -1, 152, -1, 151, 152, -1, 22, -1, 91,
- 22, -1, -1, 89, 155, 108, 156, 109, -1, 157,
- -1, 156, 157, -1, 22, -1, 20, 105, 160, 106,
- -1, 22, -1, 111, 22, -1, 159, 75, 22, -1,
- 159, 75, 111, 22, -1, 159, -1, 201, 112, 201,
- -1, 21, -1, 92, 242, -1, 45, 167, -1, 46,
- 167, -1, 166, 167, 168, -1, 43, -1, 44, -1,
+ 130, 0, -1, 131, -1, 130, 131, -1, -1, 132,
+ 133, -1, 167, -1, 165, -1, 166, -1, 135, -1,
+ 177, -1, 171, -1, 172, -1, 173, -1, 154, -1,
+ 149, -1, 153, -1, 162, -1, 163, -1, 164, -1,
+ 178, -1, 179, -1, 189, -1, 191, -1, 192, -1,
+ 193, -1, 194, -1, 195, -1, 196, -1, 197, -1,
+ 198, -1, 139, -1, 141, -1, 134, -1, 158, -1,
+ 161, -1, 146, -1, 220, -1, 225, -1, 222, -1,
+ 136, -1, 219, -1, 201, -1, 241, -1, 259, -1,
+ 180, -1, 3, 22, -1, 100, 215, 137, 245, 107,
+ 181, 138, 108, 109, -1, -1, 110, 215, 111, -1,
+ 101, 199, -1, -1, 18, 264, 245, 140, 143, -1,
+ -1, 224, 18, 264, 142, 143, -1, 107, 144, 108,
+ 109, -1, 145, -1, 144, 145, -1, 180, -1, 34,
+ 199, -1, 35, 199, -1, -1, 88, 22, 147, 107,
+ 148, 108, 109, -1, 134, -1, 148, 134, -1, -1,
+ 90, 150, 107, 151, 108, -1, 152, -1, 151, 152,
+ -1, 22, -1, 91, 22, -1, -1, 89, 155, 107,
+ 156, 108, -1, 157, -1, 156, 157, -1, 22, -1,
+ 20, 110, 160, 111, -1, 22, -1, 112, 22, -1,
+ 159, 75, 22, -1, 159, 75, 112, 22, -1, 159,
+ -1, 204, 113, 204, -1, 21, -1, 92, 245, -1,
+ 105, 169, -1, 106, 169, -1, 45, 169, -1, 46,
+ 169, -1, 168, 169, 170, -1, 43, -1, 44, -1,
22, -1, 23, -1, -1, 85, -1, 37, 23, -1,
- 38, 23, -1, 39, 23, -1, -1, 8, 196, -1,
- -1, 9, 196, -1, -1, 10, 196, -1, 17, 196,
- -1, 40, 196, -1, 41, 196, -1, 42, 196, -1,
- -1, 178, -1, 26, 196, -1, 27, 196, -1, 28,
- 196, -1, 29, 196, -1, 30, 196, -1, 31, 196,
- -1, 32, 196, -1, 14, 196, -1, 15, 196, -1,
- 11, 196, -1, 12, 196, -1, 13, 196, -1, 16,
- 196, -1, 5, 196, -1, 6, 196, -1, 7, 23,
- 200, 196, -1, 197, 21, -1, 19, -1, 197, 19,
- -1, -1, 71, 201, 242, 199, 108, 202, 109, 110,
- -1, -1, 23, -1, -1, 22, -1, -1, 203, -1,
- 204, -1, 203, 204, -1, 158, -1, 161, -1, 22,
- 206, 242, 205, -1, -1, 107, -1, -1, 113, 211,
- -1, -1, 113, 208, -1, 211, -1, 208, 209, 211,
- -1, 112, -1, 114, -1, 115, -1, 116, -1, 117,
- -1, 118, -1, -1, 111, -1, 119, -1, 112, -1,
- 114, -1, 210, 214, -1, 213, -1, 212, 74, 213,
- -1, 22, -1, 212, -1, 261, 105, 215, 106, -1,
- 86, -1, 85, -1, 94, -1, 95, -1, 96, -1,
- 24, -1, 93, -1, -1, 208, -1, 215, 107, 208,
- -1, 87, 257, 22, 242, 110, -1, 87, 257, 105,
- 260, 22, 106, 105, 262, 106, 242, 110, -1, -1,
- 48, 212, 218, 224, 242, 227, 110, -1, -1, 221,
- 220, 222, -1, 103, 120, 262, 121, -1, -1, 47,
- 212, 223, 224, 242, 227, 110, -1, -1, 122, 225,
- -1, 226, -1, 225, 107, 226, -1, 212, -1, -1,
- 108, 228, 109, -1, 229, -1, 228, 229, -1, 158,
- -1, 161, -1, 146, -1, 217, -1, 222, -1, 136,
- -1, 216, -1, 198, -1, 188, -1, 178, -1, 180,
- -1, 181, -1, 182, -1, 183, -1, 184, -1, 185,
- -1, 186, -1, 232, -1, 231, -1, 251, -1, 36,
- 196, -1, 35, 196, -1, 49, 230, 122, -1, 50,
- 230, 122, -1, 51, 230, 122, -1, 52, 122, -1,
- -1, 53, -1, 237, 119, 22, 105, 106, 263, 241,
- 242, 110, 246, 247, -1, -1, 102, 233, 234, -1,
- 234, -1, 22, 105, 248, 106, 263, 242, 235, 110,
- 246, -1, -1, 123, 105, 248, 106, 124, -1, -1,
- 123, 257, 105, 248, 106, 124, -1, -1, 70, -1,
- 257, 22, 105, 248, 106, 240, 263, 241, 242, 236,
- 110, 246, 247, -1, 257, 97, 239, 105, 248, 106,
- 240, 263, 241, 242, 236, 110, 246, 247, -1, 97,
- 257, 105, 248, 106, 240, 263, 241, 242, 236, 110,
- 246, 247, -1, 114, -1, 112, -1, 115, -1, 116,
- -1, 125, -1, 117, -1, 118, -1, 126, -1, 120,
- 120, -1, 121, 121, -1, 114, 113, -1, 112, 113,
- -1, 115, 113, -1, 116, 113, -1, 125, 113, -1,
- 117, 113, -1, 118, 113, -1, 126, 113, -1, 120,
- 120, 113, -1, 121, 121, 113, -1, 119, -1, 105,
- 106, -1, 123, 124, -1, 120, -1, 120, 113, -1,
- 113, 113, -1, 111, 113, -1, 121, -1, 121, 113,
- -1, -1, 76, -1, -1, 113, 85, -1, -1, 116,
- 243, 116, -1, 244, -1, 243, 107, 244, -1, 22,
- -1, 22, 113, 245, -1, 22, -1, 24, -1, 85,
- -1, -1, 33, 196, -1, -1, 25, 196, -1, 249,
- -1, -1, 250, -1, 249, 107, 250, -1, 78, 201,
- 242, 207, -1, 79, 201, 242, 207, -1, 80, 201,
- 242, 207, -1, 81, 201, 242, -1, 82, 201, 242,
- -1, 83, 105, 248, 106, 201, 242, -1, 84, 105,
- 248, 106, 201, 242, -1, 99, 201, 242, -1, 258,
- 207, -1, -1, 77, 252, 253, -1, 253, -1, 254,
- -1, 256, -1, -1, 70, 255, 238, -1, 238, -1,
- 257, 22, 242, 110, 172, 173, 174, -1, 76, 261,
- 260, 259, -1, 261, 260, 259, -1, 257, 201, 242,
- -1, -1, 117, -1, -1, 260, 115, -1, 212, -1,
- 212, 120, 262, 121, -1, 48, 212, -1, 73, 55,
- -1, 55, -1, 73, -1, 73, 56, -1, 56, -1,
- 57, -1, 73, 57, -1, 57, 57, -1, 73, 57,
- 57, -1, 58, -1, 59, -1, 54, -1, 72, 60,
- -1, 73, 60, -1, 60, -1, 61, -1, 62, -1,
- 63, -1, 64, -1, 65, -1, 66, -1, 67, -1,
- 68, -1, 69, -1, 104, -1, 257, -1, 262, 107,
- 257, -1, -1, 98, 105, 264, 106, -1, -1, 212,
- -1, 264, 107, 212, -1
+ 38, 23, -1, 39, 23, -1, -1, 7, 199, -1,
+ -1, 8, 199, -1, -1, 9, 199, -1, 17, 199,
+ -1, 40, 199, -1, 41, 199, -1, 42, 199, -1,
+ -1, 180, -1, 26, 199, -1, 27, 199, -1, 28,
+ 199, -1, 29, 199, -1, 30, 199, -1, 31, 199,
+ -1, 32, 199, -1, 14, 199, -1, 15, 199, -1,
+ 10, 199, -1, 11, 199, -1, 12, 199, -1, 13,
+ 199, -1, 16, 199, -1, 4, 199, -1, 5, 199,
+ -1, 6, 23, 203, 199, -1, 200, 21, -1, 19,
+ -1, 200, 19, -1, -1, 71, 204, 245, 202, 107,
+ 205, 108, 109, -1, -1, 23, -1, -1, 22, -1,
+ -1, 206, -1, 207, -1, 206, 207, -1, 158, -1,
+ 161, -1, 22, 209, 245, 208, -1, -1, 114, -1,
+ -1, 115, 214, -1, -1, 115, 211, -1, 214, -1,
+ 211, 212, 214, -1, 113, -1, 116, -1, 117, -1,
+ 118, -1, 119, -1, 120, -1, -1, 112, -1, 121,
+ -1, 113, -1, 116, -1, 213, 217, -1, 216, -1,
+ 215, 74, 216, -1, 22, -1, 215, -1, 264, 110,
+ 218, 111, -1, 86, -1, 85, -1, 94, -1, 95,
+ -1, 96, -1, 24, -1, 93, -1, -1, 211, -1,
+ 218, 114, 211, -1, 87, 260, 22, 245, 109, -1,
+ 87, 260, 110, 263, 22, 111, 110, 265, 111, 245,
+ 109, -1, -1, 48, 215, 221, 227, 245, 230, 109,
+ -1, -1, 224, 223, 225, -1, 103, 122, 265, 123,
+ -1, -1, 47, 215, 226, 227, 245, 230, 109, -1,
+ -1, 124, 228, -1, 229, -1, 228, 114, 229, -1,
+ 215, -1, -1, 107, 231, 108, -1, 232, -1, 231,
+ 232, -1, 158, -1, 161, -1, 146, -1, 220, -1,
+ 225, -1, 136, -1, 219, -1, 201, -1, 190, -1,
+ 180, -1, 182, -1, 183, -1, 184, -1, 185, -1,
+ 186, -1, 187, -1, 188, -1, 235, -1, 234, -1,
+ 254, -1, 36, 199, -1, 35, 199, -1, 49, 233,
+ 124, -1, 50, 233, 124, -1, 51, 233, 124, -1,
+ 52, 124, -1, -1, 53, -1, 240, 121, 22, 110,
+ 111, 266, 244, 245, 109, 249, 250, -1, -1, 102,
+ 236, 237, -1, 237, -1, 22, 110, 251, 111, 266,
+ 245, 238, 109, 249, -1, -1, 125, 110, 251, 111,
+ 126, -1, -1, 125, 260, 110, 251, 111, 126, -1,
+ -1, 70, -1, 260, 22, 110, 251, 111, 243, 266,
+ 244, 245, 239, 109, 249, 250, -1, 260, 97, 242,
+ 110, 251, 111, 243, 266, 244, 245, 239, 109, 249,
+ 250, -1, 97, 260, 110, 251, 111, 243, 266, 244,
+ 245, 239, 109, 249, 250, -1, 116, -1, 113, -1,
+ 117, -1, 118, -1, 127, -1, 119, -1, 120, -1,
+ 128, -1, 122, 122, -1, 123, 123, -1, 116, 115,
+ -1, 113, 115, -1, 117, 115, -1, 118, 115, -1,
+ 127, 115, -1, 119, 115, -1, 120, 115, -1, 128,
+ 115, -1, 122, 122, 115, -1, 123, 123, 115, -1,
+ 121, -1, 110, 111, -1, 125, 126, -1, 122, -1,
+ 122, 115, -1, 115, 115, -1, 112, 115, -1, 123,
+ -1, 123, 115, -1, -1, 76, -1, -1, 115, 85,
+ -1, -1, 118, 246, 118, -1, 247, -1, 246, 114,
+ 247, -1, 22, -1, 22, 115, 248, -1, 169, -1,
+ 24, -1, 85, -1, -1, 33, 199, -1, -1, 25,
+ 199, -1, 252, -1, -1, 253, -1, 252, 114, 253,
+ -1, 78, 204, 245, 210, -1, 79, 204, 245, 210,
+ -1, 80, 204, 245, 210, -1, 81, 204, 245, -1,
+ 82, 204, 245, -1, 83, 110, 251, 111, 204, 245,
+ -1, 84, 110, 251, 111, 204, 245, -1, 99, 204,
+ 245, -1, 261, 210, -1, -1, 77, 255, 256, -1,
+ 256, -1, 257, -1, 259, -1, -1, 70, 258, 241,
+ -1, 241, -1, 260, 22, 245, 109, 174, 175, 176,
+ -1, 76, 264, 263, 262, -1, 264, 263, 262, -1,
+ 260, 204, 245, -1, -1, 119, -1, -1, 263, 117,
+ -1, 215, -1, 215, 122, 265, 123, -1, 48, 215,
+ -1, 73, 55, -1, 55, -1, 73, -1, 73, 56,
+ -1, 56, -1, 57, -1, 73, 57, -1, 57, 57,
+ -1, 73, 57, 57, -1, 58, -1, 59, -1, 54,
+ -1, 72, 60, -1, 73, 60, -1, 60, -1, 61,
+ -1, 62, -1, 63, -1, 64, -1, 65, -1, 66,
+ -1, 67, -1, 68, -1, 69, -1, 104, -1, 260,
+ -1, 265, 114, 260, -1, -1, 98, 110, 267, 111,
+ -1, -1, 215, -1, 267, 114, 215, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const unsigned short int yyrline[] =
{
- 0, 310, 310, 311, 314, 314, 333, 334, 335, 336,
- 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
- 350, 354, 358, 359, 360, 361, 362, 363, 364, 365,
- 366, 367, 370, 371, 372, 373, 374, 375, 376, 377,
- 378, 379, 380, 381, 394, 397, 400, 405, 414, 449,
- 453, 527, 532, 532, 538, 538, 587, 601, 602, 605,
- 609, 618, 629, 629, 669, 670, 673, 673, 700, 701,
- 704, 709, 714, 714, 739, 740, 743, 748, 761, 764,
- 767, 770, 775, 776, 781, 787, 814, 827, 840, 873,
- 876, 881, 882, 898, 901, 904, 909, 914, 919, 922,
- 927, 930, 935, 938, 943, 948, 953, 958, 963, 966,
- 969, 974, 979, 984, 989, 994, 999, 1004, 1009, 1014,
- 1020, 1026, 1032, 1041, 1047, 1052, 1058, 1061, 1062, 1073,
- 1073, 1084, 1087, 1092, 1095, 1100, 1101, 1104, 1105, 1108,
- 1109, 1110, 1137, 1138, 1141, 1142, 1145, 1148, 1153, 1154,
- 1172, 1175, 1178, 1181, 1184, 1187, 1192, 1195, 1198, 1201,
- 1204, 1209, 1227, 1228, 1236, 1241, 1250, 1260, 1264, 1268,
- 1272, 1276, 1280, 1284, 1290, 1295, 1301, 1319, 1323, 1346,
- 1346, 1366, 1366, 1393, 1398, 1398, 1413, 1414, 1417, 1418,
- 1421, 1460, 1463, 1468, 1469, 1472, 1473, 1474, 1475, 1476,
- 1477, 1478, 1479, 1480, 1484, 1488, 1499, 1510, 1521, 1532,
- 1543, 1554, 1565, 1566, 1567, 1568, 1579, 1590, 1597, 1604,
- 1611, 1620, 1623, 1628, 1677, 1677, 1678, 1681, 1707, 1710,
- 1717, 1720, 1728, 1731, 1736, 1753, 1778, 1854, 1855, 1856,
- 1857, 1858, 1859, 1860, 1861, 1862, 1863, 1864, 1865, 1866,
- 1867, 1868, 1869, 1870, 1871, 1872, 1873, 1874, 1875, 1876,
- 1877, 1878, 1879, 1880, 1881, 1882, 1885, 1888, 1893, 1896,
- 1904, 1907, 1913, 1917, 1929, 1933, 1939, 1943, 1947, 1953,
- 1956, 1961, 1964, 1969, 2017, 2022, 2028, 2055, 2064, 2073,
- 2082, 2093, 2101, 2116, 2131, 2137, 2143, 2143, 2144, 2147,
- 2148, 2151, 2151, 2152, 2155, 2188, 2194, 2202, 2262, 2265,
- 2273, 2276, 2281, 2292, 2306, 2323, 2330, 2337, 2344, 2351,
- 2358, 2365, 2372, 2379, 2386, 2393, 2400, 2407, 2414, 2421,
- 2428, 2435, 2442, 2449, 2456, 2463, 2470, 2477, 2484, 2491,
- 2500, 2506, 2522, 2525, 2533, 2539, 2546
+ 0, 313, 313, 314, 317, 317, 336, 337, 338, 339,
+ 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
+ 350, 354, 358, 362, 363, 364, 365, 366, 367, 368,
+ 369, 370, 371, 372, 375, 376, 377, 378, 379, 380,
+ 381, 382, 383, 384, 385, 386, 399, 404, 439, 443,
+ 517, 522, 522, 528, 528, 577, 591, 592, 595, 599,
+ 608, 619, 619, 650, 651, 654, 654, 681, 682, 685,
+ 690, 695, 695, 720, 721, 724, 729, 742, 745, 748,
+ 751, 756, 757, 762, 768, 795, 806, 817, 830, 843,
+ 876, 879, 884, 885, 901, 904, 907, 912, 917, 922,
+ 925, 930, 933, 938, 941, 946, 951, 956, 961, 966,
+ 969, 972, 977, 982, 987, 992, 997, 1002, 1007, 1012,
+ 1017, 1023, 1029, 1035, 1041, 1050, 1056, 1061, 1067, 1070,
+ 1071, 1082, 1082, 1093, 1096, 1101, 1104, 1109, 1110, 1113,
+ 1114, 1117, 1118, 1119, 1146, 1147, 1150, 1151, 1154, 1157,
+ 1162, 1163, 1181, 1184, 1187, 1190, 1193, 1196, 1201, 1204,
+ 1207, 1210, 1213, 1218, 1236, 1237, 1245, 1250, 1259, 1269,
+ 1273, 1277, 1281, 1285, 1289, 1293, 1299, 1304, 1310, 1328,
+ 1332, 1355, 1355, 1375, 1375, 1402, 1407, 1407, 1422, 1423,
+ 1426, 1427, 1430, 1469, 1472, 1477, 1478, 1481, 1482, 1483,
+ 1484, 1485, 1486, 1487, 1488, 1489, 1493, 1497, 1508, 1519,
+ 1530, 1541, 1552, 1563, 1574, 1575, 1576, 1577, 1588, 1599,
+ 1606, 1613, 1620, 1629, 1632, 1637, 1686, 1686, 1687, 1690,
+ 1716, 1719, 1726, 1729, 1737, 1740, 1745, 1762, 1787, 1863,
+ 1864, 1865, 1866, 1867, 1868, 1869, 1870, 1871, 1872, 1873,
+ 1874, 1875, 1876, 1877, 1878, 1879, 1880, 1881, 1882, 1883,
+ 1884, 1885, 1886, 1887, 1888, 1889, 1890, 1891, 1894, 1897,
+ 1902, 1905, 1913, 1916, 1922, 1926, 1938, 1942, 1948, 1952,
+ 1956, 1962, 1965, 1970, 1973, 1978, 2026, 2031, 2037, 2064,
+ 2073, 2082, 2091, 2102, 2110, 2125, 2140, 2146, 2152, 2152,
+ 2153, 2156, 2157, 2160, 2160, 2161, 2164, 2197, 2203, 2211,
+ 2271, 2274, 2282, 2285, 2290, 2301, 2315, 2332, 2339, 2346,
+ 2353, 2360, 2367, 2374, 2381, 2388, 2395, 2402, 2409, 2416,
+ 2423, 2430, 2437, 2444, 2451, 2458, 2465, 2472, 2479, 2486,
+ 2493, 2500, 2509, 2515, 2531, 2534, 2542, 2548, 2555
};
#endif
@@ -774,9 +780,9 @@ static const unsigned short int yyrline[] =
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
{
- "$end", "error", "$undefined", "TK_OPTIONS", "TK_NOEMITTERS", "TK_DOC",
- "TK_EXPORTEDDOC", "TK_MAKEFILE", "TK_ACCESSCODE", "TK_GETCODE",
- "TK_SETCODE", "TK_PREINITCODE", "TK_POSTINITCODE", "TK_UNITCODE",
+ "$end", "error", "$undefined", "TK_PLUGIN", "TK_DOC", "TK_EXPORTEDDOC",
+ "TK_MAKEFILE", "TK_ACCESSCODE", "TK_GETCODE", "TK_SETCODE",
+ "TK_PREINITCODE", "TK_INITCODE", "TK_POSTINITCODE", "TK_UNITCODE",
"TK_MODCODE", "TK_TYPECODE", "TK_PREPYCODE", "TK_COPYING",
"TK_MAPPEDTYPE", "TK_CODELINE", "TK_IF", "TK_END", "TK_NAME",
"TK_PATHNAME", "TK_STRING", "TK_VIRTUALCATCHERCODE", "TK_TRAVERSECODE",
@@ -796,26 +802,27 @@ static const char *const yytname[] =
"TK_TYPEDEF", "TK_NAMESPACE", "TK_TIMELINE", "TK_PLATFORMS",
"TK_FEATURE", "TK_LICENSE", "TK_QCHAR", "TK_TRUE", "TK_FALSE", "TK_NULL",
"TK_OPERATOR", "TK_THROW", "TK_QOBJECT", "TK_EXCEPTION", "TK_RAISECODE",
- "TK_EXPLICIT", "TK_TEMPLATE", "TK_ELLIPSIS", "'('", "')'", "','", "'{'",
- "'}'", "';'", "'!'", "'-'", "'='", "'+'", "'*'", "'/'", "'&'", "'|'",
- "'~'", "'<'", "'>'", "':'", "'['", "']'", "'%'", "'^'", "$accept",
- "specification", "statement", "@1", "modstatement", "nsstatement",
- "options", "optionlist", "noemitters", "exception", "baseexception",
- "raisecode", "mappedtype", "@2", "mappedtypetmpl", "@3", "mtdefinition",
- "mtbody", "mtline", "namespace", "@4", "nsbody", "platforms", "@5",
- "platformlist", "platform", "feature", "timeline", "@6", "qualifierlist",
- "qualifiername", "ifstart", "oredqualifiers", "qualifiers", "ifend",
- "license", "consmodule", "compmodule", "module", "modlang", "modname",
+ "TK_EXPLICIT", "TK_TEMPLATE", "TK_ELLIPSIS", "TK_DEFMETATYPE",
+ "TK_DEFSUPERTYPE", "'{'", "'}'", "';'", "'('", "')'", "'!'", "'-'",
+ "','", "'='", "'+'", "'*'", "'/'", "'&'", "'|'", "'~'", "'<'", "'>'",
+ "':'", "'['", "']'", "'%'", "'^'", "$accept", "specification",
+ "statement", "@1", "modstatement", "nsstatement", "plugin", "exception",
+ "baseexception", "raisecode", "mappedtype", "@2", "mappedtypetmpl", "@3",
+ "mtdefinition", "mtbody", "mtline", "namespace", "@4", "nsbody",
+ "platforms", "@5", "platformlist", "platform", "feature", "timeline",
+ "@6", "qualifierlist", "qualifiername", "ifstart", "oredqualifiers",
+ "qualifiers", "ifend", "license", "defmetatype", "defsupertype",
+ "consmodule", "compmodule", "module", "modlang", "dottedname",
"optnumber", "include", "optinclude", "import", "optaccesscode",
"optgetcode", "optsetcode", "copying", "exphdrcode", "modhdrcode",
"typehdrcode", "opttypehdrcode", "travcode", "clearcode", "readbufcode",
"writebufcode", "segcountcode", "charbufcode", "picklecode", "modcode",
- "typecode", "preinitcode", "postinitcode", "unitcode", "prepycode",
- "doc", "exporteddoc", "makefile", "codeblock", "codelines", "enum", "@7",
- "optfilename", "optname", "optenumbody", "enumbody", "enumline",
- "optcomma", "optenumassign", "optassign", "expr", "binop", "optunop",
- "value", "scopedname", "scopepart", "simplevalue", "exprlist", "typedef",
- "struct", "@8", "classtmpl", "@9", "template", "class", "@10",
+ "typecode", "preinitcode", "initcode", "postinitcode", "unitcode",
+ "prepycode", "doc", "exporteddoc", "makefile", "codeblock", "codelines",
+ "enum", "@7", "optfilename", "optname", "optenumbody", "enumbody",
+ "enumline", "optcomma", "optenumassign", "optassign", "expr", "binop",
+ "optunop", "value", "scopedname", "scopepart", "simplevalue", "exprlist",
+ "typedef", "struct", "@8", "classtmpl", "@9", "template", "class", "@10",
"superclasses", "superlist", "superclass", "optclassbody", "classbody",
"classline", "optslot", "dtor", "ctor", "@11", "simplector",
"optctorsig", "optsig", "optvirtual", "function", "operatorname",
@@ -842,50 +849,50 @@ static const unsigned short int yytoknum[] =
325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
345, 346, 347, 348, 349, 350, 351, 352, 353, 354,
- 355, 356, 357, 358, 359, 40, 41, 44, 123, 125,
- 59, 33, 45, 61, 43, 42, 47, 38, 124, 126,
- 60, 62, 58, 91, 93, 37, 94
+ 355, 356, 357, 358, 359, 360, 361, 123, 125, 59,
+ 40, 41, 33, 45, 44, 61, 43, 42, 47, 38,
+ 124, 126, 60, 62, 58, 91, 93, 37, 94
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const unsigned short int yyr1[] =
{
- 0, 127, 128, 128, 130, 129, 131, 131, 131, 131,
- 131, 131, 131, 131, 131, 131, 131, 131, 131, 131,
- 131, 131, 131, 131, 131, 131, 131, 131, 131, 131,
- 131, 131, 132, 132, 132, 132, 132, 132, 132, 132,
- 132, 132, 132, 132, 133, 134, 134, 135, 136, 137,
- 137, 138, 140, 139, 142, 141, 143, 144, 144, 145,
- 145, 145, 147, 146, 148, 148, 150, 149, 151, 151,
- 152, 153, 155, 154, 156, 156, 157, 158, 159, 159,
- 159, 159, 160, 160, 161, 162, 163, 164, 165, 166,
- 166, 167, 167, 168, 168, 169, 170, 171, 172, 172,
- 173, 173, 174, 174, 175, 176, 177, 178, 179, 179,
- 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
- 190, 191, 192, 193, 194, 195, 196, 197, 197, 199,
- 198, 200, 200, 201, 201, 202, 202, 203, 203, 204,
- 204, 204, 205, 205, 206, 206, 207, 207, 208, 208,
- 209, 209, 209, 209, 209, 209, 210, 210, 210, 210,
- 210, 211, 212, 212, 213, 214, 214, 214, 214, 214,
- 214, 214, 214, 214, 215, 215, 215, 216, 216, 218,
- 217, 220, 219, 221, 223, 222, 224, 224, 225, 225,
- 226, 227, 227, 228, 228, 229, 229, 229, 229, 229,
- 229, 229, 229, 229, 229, 229, 229, 229, 229, 229,
- 229, 229, 229, 229, 229, 229, 229, 229, 229, 229,
- 229, 230, 230, 231, 233, 232, 232, 234, 235, 235,
- 236, 236, 237, 237, 238, 238, 238, 239, 239, 239,
- 239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
- 239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
- 239, 239, 239, 239, 239, 239, 240, 240, 241, 241,
- 242, 242, 243, 243, 244, 244, 245, 245, 245, 246,
- 246, 247, 247, 248, 249, 249, 249, 250, 250, 250,
- 250, 250, 250, 250, 250, 250, 252, 251, 251, 253,
- 253, 255, 254, 254, 256, 257, 257, 258, 259, 259,
- 260, 260, 261, 261, 261, 261, 261, 261, 261, 261,
- 261, 261, 261, 261, 261, 261, 261, 261, 261, 261,
- 261, 261, 261, 261, 261, 261, 261, 261, 261, 261,
- 262, 262, 263, 263, 264, 264, 264
+ 0, 129, 130, 130, 132, 131, 133, 133, 133, 133,
+ 133, 133, 133, 133, 133, 133, 133, 133, 133, 133,
+ 133, 133, 133, 133, 133, 133, 133, 133, 133, 133,
+ 133, 133, 133, 133, 134, 134, 134, 134, 134, 134,
+ 134, 134, 134, 134, 134, 134, 135, 136, 137, 137,
+ 138, 140, 139, 142, 141, 143, 144, 144, 145, 145,
+ 145, 147, 146, 148, 148, 150, 149, 151, 151, 152,
+ 153, 155, 154, 156, 156, 157, 158, 159, 159, 159,
+ 159, 160, 160, 161, 162, 163, 164, 165, 166, 167,
+ 168, 168, 169, 169, 170, 170, 171, 172, 173, 174,
+ 174, 175, 175, 176, 176, 177, 178, 179, 180, 181,
+ 181, 182, 183, 184, 185, 186, 187, 188, 189, 190,
+ 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
+ 200, 202, 201, 203, 203, 204, 204, 205, 205, 206,
+ 206, 207, 207, 207, 208, 208, 209, 209, 210, 210,
+ 211, 211, 212, 212, 212, 212, 212, 212, 213, 213,
+ 213, 213, 213, 214, 215, 215, 216, 217, 217, 217,
+ 217, 217, 217, 217, 217, 217, 218, 218, 218, 219,
+ 219, 221, 220, 223, 222, 224, 226, 225, 227, 227,
+ 228, 228, 229, 230, 230, 231, 231, 232, 232, 232,
+ 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,
+ 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,
+ 232, 232, 232, 233, 233, 234, 236, 235, 235, 237,
+ 238, 238, 239, 239, 240, 240, 241, 241, 241, 242,
+ 242, 242, 242, 242, 242, 242, 242, 242, 242, 242,
+ 242, 242, 242, 242, 242, 242, 242, 242, 242, 242,
+ 242, 242, 242, 242, 242, 242, 242, 242, 243, 243,
+ 244, 244, 245, 245, 246, 246, 247, 247, 248, 248,
+ 248, 249, 249, 250, 250, 251, 252, 252, 252, 253,
+ 253, 253, 253, 253, 253, 253, 253, 253, 255, 254,
+ 254, 256, 256, 258, 257, 257, 259, 260, 260, 261,
+ 262, 262, 263, 263, 264, 264, 264, 264, 264, 264,
+ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
+ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
+ 264, 264, 265, 265, 266, 266, 267, 267, 267
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -895,37 +902,37 @@ static const unsigned char yyr2[] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 4, 1, 3, 1, 9, 0,
- 3, 2, 0, 5, 0, 5, 4, 1, 2, 1,
- 2, 2, 0, 7, 1, 2, 0, 5, 1, 2,
- 1, 2, 0, 5, 1, 2, 1, 4, 1, 2,
- 3, 4, 1, 3, 1, 2, 2, 2, 3, 1,
- 1, 1, 1, 0, 1, 2, 2, 2, 0, 2,
- 0, 2, 0, 2, 2, 2, 2, 2, 0, 1,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 4, 2, 1, 2, 0,
- 8, 0, 1, 0, 1, 0, 1, 1, 2, 1,
- 1, 4, 0, 1, 0, 2, 0, 2, 1, 3,
- 1, 1, 1, 1, 1, 1, 0, 1, 1, 1,
- 1, 2, 1, 3, 1, 1, 4, 1, 1, 1,
- 1, 1, 1, 1, 0, 1, 3, 5, 11, 0,
- 7, 0, 3, 4, 0, 7, 0, 2, 1, 3,
- 1, 0, 3, 1, 2, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 2, 2, 3, 3, 3,
- 2, 0, 1, 11, 0, 3, 1, 9, 0, 5,
- 0, 6, 0, 1, 13, 14, 13, 1, 1, 1,
- 1, 1, 1, 1, 1, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 3, 3, 1, 2, 2,
- 1, 2, 2, 2, 1, 2, 0, 1, 0, 2,
- 0, 3, 1, 3, 1, 3, 1, 1, 1, 0,
- 2, 0, 2, 1, 0, 1, 3, 4, 4, 4,
- 3, 3, 6, 6, 3, 2, 0, 3, 1, 1,
- 1, 0, 3, 1, 7, 4, 3, 3, 0, 1,
- 0, 2, 1, 4, 2, 2, 1, 1, 2, 1,
- 1, 2, 2, 3, 1, 1, 1, 2, 2, 1,
+ 1, 1, 1, 1, 1, 1, 2, 9, 0, 3,
+ 2, 0, 5, 0, 5, 4, 1, 2, 1, 2,
+ 2, 0, 7, 1, 2, 0, 5, 1, 2, 1,
+ 2, 0, 5, 1, 2, 1, 4, 1, 2, 3,
+ 4, 1, 3, 1, 2, 2, 2, 2, 2, 3,
+ 1, 1, 1, 1, 0, 1, 2, 2, 2, 0,
+ 2, 0, 2, 0, 2, 2, 2, 2, 2, 0,
+ 1, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 4, 2, 1,
+ 2, 0, 8, 0, 1, 0, 1, 0, 1, 1,
+ 2, 1, 1, 4, 0, 1, 0, 2, 0, 2,
+ 1, 3, 1, 1, 1, 1, 1, 1, 0, 1,
+ 1, 1, 1, 2, 1, 3, 1, 1, 4, 1,
+ 1, 1, 1, 1, 1, 1, 0, 1, 3, 5,
+ 11, 0, 7, 0, 3, 4, 0, 7, 0, 2,
+ 1, 3, 1, 0, 3, 1, 2, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 3, 0, 4, 0, 1, 3
+ 1, 1, 1, 1, 1, 1, 1, 2, 2, 3,
+ 3, 3, 2, 0, 1, 11, 0, 3, 1, 9,
+ 0, 5, 0, 6, 0, 1, 13, 14, 13, 1,
+ 1, 1, 1, 1, 1, 1, 1, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 3, 3, 1,
+ 2, 2, 1, 2, 2, 2, 1, 2, 0, 1,
+ 0, 2, 0, 3, 1, 3, 1, 3, 1, 1,
+ 1, 0, 2, 0, 2, 1, 0, 1, 3, 4,
+ 4, 4, 3, 3, 6, 6, 3, 2, 0, 3,
+ 1, 1, 1, 0, 3, 1, 7, 4, 3, 3,
+ 0, 1, 0, 2, 1, 4, 2, 2, 1, 1,
+ 2, 1, 1, 2, 2, 3, 1, 1, 1, 2,
+ 2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 3, 0, 4, 0, 1, 3
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -933,441 +940,451 @@ static const unsigned char yyr2[] =
means the default is an error. */
static const unsigned short int yydefact[] =
{
- 4, 4, 2, 0, 1, 3, 0, 47, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 84,
- 164, 0, 0, 0, 0, 0, 0, 89, 90, 0,
- 0, 0, 0, 326, 316, 319, 320, 324, 325, 329,
- 330, 331, 332, 333, 334, 335, 336, 337, 338, 133,
- 0, 317, 0, 0, 0, 72, 66, 0, 270, 0,
- 0, 0, 339, 5, 31, 9, 10, 38, 29, 30,
- 34, 16, 17, 15, 32, 33, 18, 7, 8, 6,
- 0, 12, 13, 14, 11, 19, 20, 43, 21, 22,
- 23, 24, 25, 26, 27, 28, 40, 312, 162, 39,
- 35, 37, 181, 36, 41, 42, 0, 310, 0, 127,
- 123, 0, 124, 131, 119, 120, 121, 117, 122, 104,
- 0, 270, 133, 95, 96, 97, 105, 106, 107, 91,
- 92, 86, 87, 184, 179, 322, 134, 270, 327, 315,
- 318, 321, 328, 310, 0, 62, 0, 0, 71, 0,
- 85, 0, 49, 0, 93, 0, 0, 0, 0, 270,
- 0, 308, 45, 0, 128, 126, 132, 0, 314, 52,
- 78, 0, 82, 0, 0, 186, 186, 129, 323, 308,
- 270, 310, 0, 0, 0, 274, 0, 272, 284, 0,
- 270, 340, 0, 94, 88, 163, 0, 54, 182, 284,
- 0, 0, 0, 238, 0, 237, 239, 240, 242, 243,
- 257, 260, 264, 0, 241, 244, 0, 311, 309, 306,
- 44, 0, 125, 0, 79, 0, 77, 133, 0, 270,
- 270, 0, 305, 0, 0, 0, 76, 0, 74, 70,
- 0, 68, 0, 0, 271, 133, 133, 133, 133, 133,
- 0, 0, 133, 0, 283, 285, 133, 146, 0, 0,
- 0, 183, 313, 0, 0, 98, 258, 263, 248, 262,
- 247, 249, 250, 252, 253, 261, 245, 265, 246, 259,
- 251, 254, 284, 46, 0, 53, 80, 0, 83, 190,
- 187, 188, 191, 191, 135, 177, 0, 64, 0, 181,
- 73, 75, 67, 69, 276, 277, 278, 275, 273, 270,
- 270, 270, 270, 270, 284, 284, 270, 266, 0, 270,
- 156, 295, 50, 108, 341, 55, 266, 0, 100, 255,
- 256, 0, 0, 0, 0, 57, 59, 81, 0, 232,
- 0, 0, 144, 139, 140, 0, 136, 137, 0, 0,
- 65, 146, 146, 146, 290, 291, 0, 0, 294, 267,
- 342, 286, 307, 157, 159, 160, 158, 147, 0, 148,
- 109, 0, 342, 99, 0, 102, 266, 60, 61, 0,
- 58, 189, 0, 164, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 221, 221, 221, 0, 301, 296, 224,
- 200, 197, 195, 196, 204, 205, 206, 207, 208, 209,
- 210, 211, 203, 202, 201, 198, 199, 232, 193, 213,
- 212, 226, 0, 303, 214, 298, 299, 300, 185, 180,
- 156, 270, 0, 138, 0, 63, 287, 288, 289, 133,
- 133, 0, 268, 150, 151, 152, 153, 154, 155, 156,
- 172, 168, 167, 173, 169, 170, 171, 165, 161, 0,
- 0, 0, 268, 101, 0, 304, 342, 56, 118, 284,
- 110, 111, 112, 113, 114, 115, 116, 216, 215, 222,
- 0, 0, 0, 220, 0, 0, 0, 192, 194, 0,
- 145, 142, 130, 0, 270, 270, 344, 0, 270, 149,
- 156, 51, 0, 270, 103, 268, 0, 217, 218, 219,
- 302, 0, 301, 297, 0, 225, 0, 143, 141, 270,
- 292, 293, 345, 0, 269, 230, 175, 0, 48, 230,
- 270, 342, 0, 0, 0, 343, 0, 0, 0, 166,
- 156, 0, 230, 270, 342, 178, 346, 0, 279, 176,
- 279, 0, 228, 268, 284, 0, 281, 281, 279, 0,
- 0, 270, 0, 280, 0, 236, 234, 281, 284, 279,
- 0, 0, 282, 235, 0, 227, 279, 231, 0, 281,
- 229, 223
+ 4, 4, 2, 0, 1, 3, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 83,
+ 166, 0, 0, 0, 0, 0, 0, 90, 91, 0,
+ 0, 0, 0, 328, 318, 321, 322, 326, 327, 331,
+ 332, 333, 334, 335, 336, 337, 338, 339, 340, 135,
+ 0, 319, 0, 0, 0, 71, 65, 0, 272, 0,
+ 0, 0, 341, 0, 0, 5, 33, 9, 40, 31,
+ 32, 36, 15, 16, 14, 34, 35, 17, 18, 19,
+ 7, 8, 6, 0, 11, 12, 13, 10, 20, 21,
+ 45, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 42, 314, 164, 41, 37, 39, 183, 38, 43, 44,
+ 0, 312, 46, 129, 125, 0, 126, 133, 120, 121,
+ 122, 123, 118, 124, 105, 0, 272, 135, 96, 97,
+ 98, 106, 107, 108, 92, 93, 87, 88, 186, 181,
+ 324, 136, 272, 329, 317, 320, 323, 330, 312, 0,
+ 61, 0, 0, 70, 0, 84, 0, 48, 0, 85,
+ 86, 94, 0, 0, 0, 0, 272, 0, 310, 130,
+ 128, 134, 0, 316, 51, 77, 0, 81, 0, 0,
+ 188, 188, 131, 325, 310, 272, 312, 0, 0, 0,
+ 276, 0, 274, 286, 0, 272, 342, 0, 95, 89,
+ 165, 0, 53, 184, 286, 0, 0, 0, 240, 0,
+ 239, 241, 242, 244, 245, 259, 262, 266, 0, 243,
+ 246, 0, 313, 311, 308, 127, 0, 78, 0, 76,
+ 135, 0, 272, 272, 0, 307, 0, 0, 0, 75,
+ 0, 73, 69, 0, 67, 0, 0, 273, 135, 135,
+ 135, 135, 135, 0, 0, 135, 0, 285, 287, 135,
+ 148, 0, 0, 0, 185, 315, 0, 0, 99, 260,
+ 265, 250, 264, 249, 251, 252, 254, 255, 263, 247,
+ 267, 248, 261, 253, 256, 286, 0, 52, 79, 0,
+ 82, 192, 189, 190, 193, 193, 137, 179, 0, 63,
+ 0, 183, 72, 74, 66, 68, 279, 280, 278, 277,
+ 275, 272, 272, 272, 272, 272, 286, 286, 272, 268,
+ 0, 272, 158, 297, 49, 109, 343, 54, 268, 0,
+ 101, 257, 258, 0, 0, 0, 0, 56, 58, 80,
+ 0, 234, 0, 0, 146, 141, 142, 0, 138, 139,
+ 0, 0, 64, 148, 148, 148, 292, 293, 0, 0,
+ 296, 269, 344, 288, 309, 159, 161, 162, 160, 149,
+ 0, 150, 110, 0, 344, 100, 0, 103, 268, 59,
+ 60, 0, 57, 191, 0, 166, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 223, 223, 223, 0, 303,
+ 298, 226, 202, 199, 197, 198, 206, 207, 208, 209,
+ 210, 211, 212, 213, 205, 204, 203, 200, 201, 234,
+ 195, 215, 214, 228, 0, 305, 216, 300, 301, 302,
+ 187, 182, 158, 272, 0, 140, 0, 62, 289, 290,
+ 291, 135, 135, 0, 270, 152, 153, 154, 155, 156,
+ 157, 158, 174, 170, 169, 175, 171, 172, 173, 167,
+ 163, 0, 0, 0, 270, 102, 0, 306, 344, 55,
+ 119, 286, 111, 112, 113, 114, 115, 116, 117, 218,
+ 217, 224, 0, 0, 0, 222, 0, 0, 0, 194,
+ 196, 0, 147, 144, 132, 0, 272, 272, 346, 0,
+ 272, 151, 158, 50, 0, 272, 104, 270, 0, 219,
+ 220, 221, 304, 0, 303, 299, 0, 227, 0, 145,
+ 143, 272, 294, 295, 347, 0, 271, 232, 177, 0,
+ 47, 232, 272, 344, 0, 0, 0, 345, 0, 0,
+ 0, 168, 158, 0, 232, 272, 344, 180, 348, 0,
+ 281, 178, 281, 0, 230, 270, 286, 0, 283, 283,
+ 281, 0, 0, 272, 0, 282, 0, 238, 236, 283,
+ 286, 281, 0, 0, 284, 237, 0, 229, 281, 233,
+ 0, 283, 231, 225
};
/* YYDEFGOTO[NTERM-NUM]. */
static const short int yydefgoto[] =
{
- -1, 1, 2, 3, 63, 64, 65, 163, 66, 67,
- 190, 461, 68, 223, 69, 263, 285, 334, 335, 70,
- 182, 298, 71, 147, 240, 241, 72, 73, 146, 237,
- 238, 74, 172, 173, 75, 76, 77, 78, 79, 80,
- 131, 194, 81, 82, 83, 328, 375, 465, 84, 85,
- 86, 87, 371, 405, 406, 407, 408, 409, 410, 411,
- 88, 412, 89, 90, 91, 92, 93, 94, 95, 110,
- 111, 96, 231, 167, 137, 345, 346, 347, 518, 431,
- 321, 367, 449, 368, 369, 97, 98, 458, 527, 99,
- 100, 176, 101, 158, 299, 103, 175, 229, 290, 291,
- 340, 417, 418, 480, 419, 420, 486, 421, 560, 538,
- 422, 104, 216, 360, 498, 150, 186, 187, 307, 556,
- 565, 253, 254, 255, 424, 485, 425, 426, 484, 105,
- 256, 257, 219, 161, 107, 192, 442, 523
+ -1, 1, 2, 3, 65, 66, 67, 68, 195, 463,
+ 69, 226, 70, 266, 287, 336, 337, 71, 187, 300,
+ 72, 152, 243, 244, 73, 74, 151, 240, 241, 75,
+ 177, 178, 76, 77, 78, 79, 80, 81, 82, 83,
+ 136, 199, 84, 85, 86, 330, 377, 467, 87, 88,
+ 89, 90, 373, 407, 408, 409, 410, 411, 412, 413,
+ 91, 414, 92, 93, 94, 95, 96, 97, 98, 99,
+ 114, 115, 100, 234, 172, 142, 347, 348, 349, 520,
+ 433, 323, 369, 451, 370, 371, 101, 102, 460, 529,
+ 103, 104, 181, 105, 165, 301, 107, 180, 232, 292,
+ 293, 342, 419, 420, 482, 421, 422, 488, 423, 562,
+ 540, 424, 108, 221, 362, 500, 155, 191, 192, 309,
+ 558, 567, 256, 257, 258, 426, 487, 427, 428, 486,
+ 109, 259, 260, 224, 168, 111, 197, 444, 525
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -443
+#define YYPACT_NINF -494
static const short int yypact[] =
{
- -443, 63, -443, 520, -443, -443, -39, -443, 66, 66,
- 68, 66, 66, 66, 66, 66, 66, 863, 23, -443,
- -443, 80, 86, 113, 66, 66, 66, -443, -443, 109,
- 109, 124, 124, -443, -443, -443, 92, -443, -443, -443,
- -443, -443, -443, -443, -443, -443, -443, -443, -443, 139,
- 103, 188, 863, 439, 143, -443, -443, 148, 69, 439,
- 124, 59, -443, -443, -443, -443, -443, -443, -443, -443,
- -443, -443, -443, -443, -443, -443, -443, -443, -443, -443,
- 109, -443, -443, -443, -443, -443, -443, -443, -443, -443,
- -443, -443, -443, -443, -443, -443, -443, -32, -443, -443,
- -443, -443, 170, -443, -443, -443, 32, -443, 169, -443,
- -443, 87, -443, 209, -443, -443, -443, -443, -443, -443,
- 124, 69, 4, -443, -443, -443, -443, -443, -443, -443,
- -443, -443, -443, 137, -1, -443, -443, 69, -443, -443,
- -443, 178, -443, -443, 5, -443, 144, 153, -443, 234,
- -443, 159, -25, 439, 182, 124, 439, 863, 216, -49,
- 160, 28, -443, 67, -443, -443, -443, 66, 137, -443,
- 156, 247, 207, 181, 172, 166, 166, -443, -443, 28,
- 69, -443, 185, 268, 272, 184, 26, -443, 158, 124,
- 69, -443, -42, -443, -443, -443, -35, -443, -443, 158,
- 211, 189, 206, 212, 213, 214, 215, 217, 220, 221,
- -443, -52, -26, 205, 222, 223, 233, -443, -443, -443,
- -443, 317, -443, 232, -443, 12, -443, 139, 124, 69,
- 69, 235, -443, 236, 3, 787, -443, 8, -443, -443,
- 16, -443, 19, 234, -443, 139, 139, 139, 139, 139,
- 237, 239, 139, 241, 242, -443, 139, 238, -12, 245,
- 439, -443, -443, 232, 246, 342, -443, -443, -443, -443,
- -443, -443, -443, -443, -443, -443, 243, -443, 249, -443,
- -443, -443, 158, -443, 141, -443, -443, 332, -443, 137,
- 248, -443, 250, 250, 229, -443, 251, -443, 728, -443,
- -443, -443, -443, -443, -443, -443, -443, -443, -443, 69,
- 69, 69, 69, 69, 158, 158, 69, 283, 158, 69,
- 45, -443, -443, 318, -443, -443, 283, 66, 354, -443,
- -443, 258, 66, 66, 18, -443, -443, -443, 124, 669,
- 256, 257, 255, -443, -443, 260, 229, -443, 265, 261,
- -443, 238, 238, 238, -443, -443, 266, 278, -443, -443,
- 289, -443, -443, -443, -443, -443, -443, 81, 381, -443,
- -443, 290, 289, -443, 66, 380, 283, -443, -443, 282,
- -443, -443, 66, 288, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 343, 343, 343, 273, 279, -443, -443,
- -443, -443, -443, -443, -443, -443, -443, -443, -443, -443,
- -443, -443, -443, -443, -443, -443, -443, 606, -443, -443,
- -443, -443, 280, -443, -443, -443, -443, -443, -443, -443,
- 45, 69, 287, -443, 439, -443, -443, -443, -443, 139,
- 139, 295, 291, -443, -443, -443, -443, -443, -443, 45,
- -443, -443, -443, -443, -443, -443, -443, -27, -443, 296,
- 66, 293, 291, -443, 66, -443, 289, -443, -443, 158,
- -443, -443, -443, -443, -443, -443, -443, -443, -443, -443,
- 284, 285, 286, -443, 840, 244, 387, -443, -443, 389,
- -443, 305, -443, 102, 69, 69, 124, 328, 69, -443,
- 75, -443, 304, 69, -443, 291, 310, -443, -443, -443,
- -443, 33, -443, -443, 288, -443, 312, -443, -443, 69,
- -443, -443, 137, 122, -443, 297, 81, 140, -443, 297,
- 69, 289, 313, 316, 309, -443, 124, 439, 314, -443,
- 45, 315, 297, 69, 289, -443, 137, 321, 390, 81,
- 390, 320, 308, 291, 158, 66, 402, 402, 390, 323,
- 346, 69, 327, -443, 66, -443, -443, 402, 158, 390,
- 347, 334, -443, -443, 353, -443, 390, -443, 336, 402,
- -443, -443
+ -494, 140, -494, 522, -494, -494, 40, 115, 115, 148,
+ 115, 115, 115, 115, 115, 115, 115, 912, 88, -494,
+ -494, 185, 192, 193, 115, 115, 115, -494, -494, 84,
+ 84, 181, 181, -494, -494, -494, 150, -494, -494, -494,
+ -494, -494, -494, -494, -494, -494, -494, -494, -494, 196,
+ 159, 134, 912, 441, 202, -494, -494, 203, 109, 441,
+ 181, 106, -494, 84, 84, -494, -494, -494, -494, -494,
+ -494, -494, -494, -494, -494, -494, -494, -494, -494, -494,
+ -494, -494, -494, 84, -494, -494, -494, -494, -494, -494,
+ -494, -494, -494, -494, -494, -494, -494, -494, -494, -494,
+ -494, -21, -494, -494, -494, -494, 211, -494, -494, -494,
+ 32, -494, -494, -494, -494, 66, -494, 210, -494, -494,
+ -494, -494, -494, -494, -494, 181, 109, 7, -494, -494,
+ -494, -494, -494, -494, -494, -494, -494, -494, 160, 1,
+ -494, -494, 109, -494, -494, -494, 178, -494, -494, 17,
+ -494, 130, 147, -494, 236, -494, 149, -13, 441, -494,
+ -494, 177, 181, 441, 912, 216, -46, 320, 63, -494,
+ -494, -494, 115, 160, -494, 151, 243, 191, 156, 155,
+ 146, 146, -494, -494, 63, 109, -494, 167, 253, 254,
+ 162, 79, -494, 784, 181, 109, -494, 27, -494, -494,
+ -494, 39, -494, -494, 784, 170, 169, 168, 174, 175,
+ 176, 179, 182, 207, 209, -494, 43, -11, 173, 215,
+ 218, 172, -494, -494, -494, -494, 186, -494, 9, -494,
+ 196, 181, 109, 109, 189, -494, 222, 5, 731, -494,
+ 8, -494, -494, 18, -494, 20, 236, -494, 196, 196,
+ 196, 196, 196, 190, 224, 196, 214, 171, -494, 196,
+ 220, -16, 229, 441, -494, -494, 186, 226, 331, -494,
+ -494, -494, -494, -494, -494, -494, -494, -494, -494, 225,
+ -494, 227, -494, -494, -494, 784, 135, -494, -494, 319,
+ -494, 160, 231, -494, 239, 239, 180, -494, 232, -494,
+ 184, -494, -494, -494, -494, -494, -494, -494, -494, -494,
+ -494, 109, 109, 109, 109, 109, 784, 784, 109, 271,
+ 784, 109, 31, -494, -494, 307, -494, -494, 271, 115,
+ 342, -494, -494, 241, 115, 115, 25, -494, -494, -494,
+ 181, 672, 244, 245, 240, -494, -494, 248, 180, -494,
+ 249, 251, -494, 220, 220, 220, -494, -494, 246, 250,
+ -494, -494, 260, -494, -494, -494, -494, -494, -494, 68,
+ 837, -494, -494, 261, 260, -494, 115, 355, 271, -494,
+ -494, 257, -494, -494, 115, 259, 115, 115, 115, 115,
+ 115, 115, 115, 115, 115, 314, 314, 314, 263, 252,
+ -494, -494, -494, -494, -494, -494, -494, -494, -494, -494,
+ -494, -494, -494, -494, -494, -494, -494, -494, -494, 609,
+ -494, -494, -494, -494, 267, -494, -494, -494, -494, -494,
+ -494, -494, 31, 109, 262, -494, 441, -494, -494, -494,
+ -494, 196, 196, 264, 255, -494, -494, -494, -494, -494,
+ -494, 31, -494, -494, -494, -494, -494, -494, -494, -29,
+ -494, 265, 115, 281, 255, -494, 115, -494, 260, -494,
+ -494, 784, -494, -494, -494, -494, -494, -494, -494, -494,
+ -494, -494, 266, 268, 269, -494, 889, 247, 350, -494,
+ -494, 369, -494, 280, -494, 34, 109, 109, 181, 312,
+ 109, -494, 62, -494, 289, 109, -494, 255, 290, -494,
+ -494, -494, -494, 33, -494, -494, 259, -494, 292, -494,
+ -494, 109, -494, -494, 160, 49, -494, 275, 68, 85,
+ -494, 275, 109, 260, 293, 294, 297, -494, 181, 441,
+ 298, -494, 31, 299, 275, 109, 260, -494, 160, 300,
+ 376, 68, 376, 302, 287, 255, 784, 115, 388, 388,
+ 376, 304, 306, 109, 305, -494, 115, -494, -494, 388,
+ 784, 376, 309, 295, -494, -494, 308, -494, 376, -494,
+ 296, 388, -494, -494
};
/* YYPGOTO[NTERM-NUM]. */
static const short int yypgoto[] =
{
- -443, -443, 461, -443, -443, -199, -443, -443, -443, -310,
- -443, -443, -443, -443, -443, -443, 200, -443, 130, -306,
- -443, -443, -443, -443, -443, 225, -443, -443, -443, -443,
- 231, -270, -443, -443, -262, -443, -443, -443, -443, -443,
- 9, -443, -443, -443, -443, -443, -443, -443, -443, -443,
- -443, -264, -443, -443, -443, -443, -443, -443, -443, -443,
- -443, -443, -443, -443, -443, -443, -443, -443, -443, -9,
- -443, -304, -443, -443, -108, -443, -443, 123, -443, -443,
- -98, -442, -443, -443, -366, -23, 324, -443, -443, -293,
- -291, -443, -443, -443, 467, -147, -443, 302, -443, 133,
- 179, -443, 64, -135, -443, -443, -443, -6, -443, -437,
- -443, -317, -443, -286, -431, -109, -443, 267, -443, -398,
- -395, -180, -443, 168, -443, -443, 6, -443, -443, -316,
- -2, -443, 311, -99, -7, -143, -354, -443
+ -494, -494, 422, -494, -494, -192, -494, -309, -494, -494,
+ -494, -494, -494, -494, 158, -494, 89, -308, -494, -494,
+ -494, -494, -494, 183, -494, -494, -494, -494, 187, -270,
+ -494, -494, -268, -494, -494, -494, -494, -494, -494, -494,
+ -15, -494, -494, -494, -494, -494, -494, -494, -494, -494,
+ -494, -262, -494, -494, -494, -494, -494, -494, -494, -494,
+ -494, -494, -494, -494, -494, -494, -494, -494, -494, -494,
+ -8, -494, -306, -494, -494, -113, -494, -494, 80, -494,
+ -494, -132, -446, -494, -494, -362, -22, 284, -494, -494,
+ -304, -291, -494, -494, -494, 426, -146, -494, 270, -494,
+ 110, 154, -494, 36, -242, -494, -494, -494, -36, -494,
+ -462, -494, -320, -494, -292, -430, -101, -494, 213, -494,
+ -469, -493, -193, -494, 133, -494, -494, -31, -494, -494,
+ -319, -2, -494, 273, -96, -5, -150, -354, -494
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -315
+#define YYTABLE_NINF -317
static const short int yytable[] =
{
- 112, 106, 114, 115, 116, 117, 118, 119, 133, 134,
- 121, 198, 169, 196, 174, 126, 127, 128, 462, 264,
- 336, -314, 423, 427, 343, 296, 170, 180, 177, 400,
- 236, 503, 344, 401, 286, 413, 297, 152, 239, 132,
- 372, 304, 155, 305, 179, 143, 414, 155, 415, 155,
- 200, 144, 332, 333, 159, 532, 199, 151, 526, 370,
- 26, 275, 155, 4, 490, 260, 108, 149, 276, 402,
- 336, 233, 260, 155, 530, 404, 343, 403, -312, 261,
- 189, 259, 234, 499, 344, 109, 262, 277, 156, 154,
- 466, 113, 541, 156, 322, 278, -314, 168, 549, 350,
- 423, 427, 331, 123, 306, 551, 164, 400, 165, 124,
- 181, 401, 505, 413, -314, 171, -314, 300, 217, 288,
- 292, 293, 561, 287, 414, 302, 415, 379, 122, 160,
- 160, 129, 130, 243, 356, 357, 125, 309, 310, 311,
- 312, 313, 244, 217, 316, 218, 20, 402, 319, 135,
- 197, 191, 557, 404, 191, 403, 363, 364, 222, 365,
- 567, 136, 566, 138, 366, 145, 258, 510, 423, 427,
- 148, 575, 573, 220, 221, 332, 333, 543, 579, 153,
- 20, -174, -174, 26, 581, 149, 363, 364, 157, 365,
- 553, 162, 416, 443, 366, 444, 445, 446, 447, 448,
- 351, 352, 353, 354, 355, 289, 120, 358, 519, 260,
- 362, 155, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 535, 536,
- 50, 51, 166, 106, 52, 178, 245, 246, 247, 248,
- 249, 250, 251, 139, 140, 141, 539, 540, 142, 18,
- 19, 342, 183, 436, 437, 438, 185, 252, 324, 481,
- 482, 184, 62, 31, 188, 201, 20, 193, -134, 224,
- 416, 202, 203, 204, 205, 206, 207, 208, 209, 210,
- 211, 212, 225, 213, 227, 214, 215, 226, 228, 506,
- 236, 493, 120, 235, 239, 266, 106, 242, 33, 34,
+ 116, 110, 118, 119, 120, 121, 122, 123, 124, 138,
+ 139, 267, 126, 201, 179, 137, 131, 132, 133, 203,
+ 464, 425, 429, -316, 338, 174, 345, 298, 346, 175,
+ 239, 288, 402, 403, 505, 415, 374, 416, 157, 185,
+ 242, 182, 134, 135, 306, 162, 299, 148, 159, 160,
+ 417, 149, 184, 162, 166, 534, 528, 156, 162, 334,
+ 335, 162, 112, 372, 204, 205, 568, 26, 161, 543,
+ 492, 404, 154, 405, 338, 162, 575, 532, 345, 406,
+ 346, -314, 553, 559, 236, 169, 468, 170, 583, 501,
+ 237, 569, 333, 163, 262, 324, 551, 194, -316, 425,
+ 429, 163, 577, 173, 280, 307, 134, 135, 352, 581,
+ 402, 403, 281, 415, 507, 416, 302, 290, -316, 176,
+ -316, 289, 222, 358, 359, 563, 304, 186, 417, 167,
+ 167, 294, 295, 381, 113, 311, 312, 313, 314, 315,
+ 4, 263, 318, 365, 366, 521, 321, 367, 263, 404,
+ 264, 405, 368, 263, 483, 484, 196, 406, 278, 202,
+ 537, 196, 265, 538, 225, 279, 512, 425, 429, 334,
+ 335, 117, 261, -176, 365, 366, -176, 26, 367, 545,
+ 222, 445, 223, 368, 446, 447, 448, 449, 450, 144,
+ 145, 146, 555, 246, 147, 418, 541, 247, 127, 542,
+ 18, 19, 344, 20, 18, 19, 20, 140, 128, 291,
+ 353, 354, 355, 356, 357, 129, 130, 360, 141, 143,
+ 364, 438, 439, 440, 150, 153, 26, 154, 158, 164,
+ 308, 31, 32, 171, 162, 183, 110, 188, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 512, 289, 50, 51, 373, 267,
- 52, 265, 491, 377, 378, 268, 269, 270, 271, 279,
- 272, 494, 495, 273, 274, 280, 281, 106, 282, 283,
- 284, 59, 314, 294, 315, 457, 295, 317, 62, 318,
- 327, 320, 326, 323, 337, 338, 329, 348, 339, 359,
- 26, 459, 330, 374, 376, 463, 428, 429, 430, 432,
- 434, 435, 439, 468, 562, 470, 471, 472, 473, 474,
- 475, 476, 477, 478, 440, 520, 521, 441, 574, 525,
- 464, 460, 467, 469, 529, 483, 479, 492, -233, 489,
- 496, 500, 502, 20, 497, 450, 507, 508, 509, 514,
- 534, 516, 517, 524, 528, 106, 531, 533, 199, 545,
- 537, 542, 544, 555, 548, 550, 554, 564, 568, 120,
- 558, 559, 191, 571, 552, 33, 34, 35, 36, 37,
+ 45, 46, 47, 48, 189, 49, 50, 51, 190, 193,
+ 52, 326, 198, 31, -136, 227, 228, 229, 230, 20,
+ 231, 53, 54, 418, 238, 239, 242, 245, 508, 268,
+ 269, 59, 285, 270, 60, 320, 495, 61, 62, 271,
+ 272, 273, 351, 286, 274, 125, 296, 275, 110, 282,
+ 316, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 514, 291, 50,
+ 51, 375, 276, 52, 277, 319, 379, 380, 496, 497,
+ 283, 297, 493, 284, 317, 322, 325, 328, 329, 110,
+ 331, 339, 332, 350, 59, 340, 341, 361, 459, 26,
+ 376, 62, 378, 430, 431, 432, 434, 441, 443, 436,
+ 437, 442, 462, 564, 466, 461, 469, 481, 465, 471,
+ 499, 494, 516, -235, 498, 502, 470, 576, 472, 473,
+ 474, 475, 476, 477, 478, 479, 480, 485, 491, 504,
+ 509, 518, 510, 511, 519, 522, 523, 526, 530, 527,
+ 539, 533, 535, 204, 531, 546, 547, 550, 552, 557,
+ 556, 560, 561, 566, 570, 571, 573, 110, 578, 580,
+ 536, 579, 582, 5, 327, 382, 305, 303, 435, 106,
+ 206, 544, 207, 208, 196, 209, 210, 211, 212, 213,
+ 214, 215, 216, 217, 554, 218, 200, 219, 220, 343,
+ 383, 233, 517, 363, 503, 490, 515, 235, 506, 310,
+ 0, 0, 572, 20, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 524, 0, 0, 0,
+ 0, 0, 0, 0, 513, 110, 0, 0, 0, 125,
+ 0, 0, 0, 0, 0, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 501, 570, 50, 51, 504, 569, 576, 577, 578,
- 580, 20, 5, 325, 380, 303, 451, 452, 301, 433,
- 102, 381, 341, 522, 453, 454, 455, 456, 230, 195,
- 515, 488, 511, 106, 0, 62, 361, 120, 0, 0,
- 232, 513, 0, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 0,
- 308, 50, 51, 546, 0, 52, 0, 0, 0, 0,
- 0, 0, 0, 6, 7, 8, 9, 10, 0, 0,
- 0, 11, 12, 13, 14, 547, 15, 16, 17, 0,
- 18, 19, 20, 62, 0, 0, 563, 0, 0, 0,
- 0, 0, 0, 0, 0, 572, 0, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 0,
- 0, 0, 0, 0, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 0, 49, 50, 51, 0, 0, 52, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 53, 54, 55,
- 56, 57, 58, 0, 0, 0, 0, 59, 0, 0,
- 60, 382, 0, 61, 62, 0, 18, 19, 383, 0,
- 0, 0, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 391, 392, 0, 0, 0, 0, 0, 26, 0,
- 0, 0, 0, 31, 32, 393, 394, 395, 396, 0,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 397, 49, 50, 51,
- 0, 0, 52, 398, 382, 0, 0, 0, 0, 18,
- 19, 383, 0, 53, 54, 384, 385, 386, 387, 388,
- 389, 390, 0, 59, 391, 392, 60, 0, 399, 0,
- 62, 26, 0, 0, 0, 487, 31, 32, 393, 394,
- 395, 396, 0, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 397,
- 49, 50, 51, 0, 0, 52, 398, 0, 18, 19,
- 20, 0, 0, 0, 0, 0, 53, 54, 0, 0,
- 0, 0, 0, 0, 0, 0, 59, 0, 0, 60,
- 26, 399, 0, 62, 0, 31, 32, 0, 0, 0,
- 0, 0, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 0, 49,
- 50, 51, 0, 0, 52, 0, 0, 18, 19, 20,
- 0, 0, 0, 0, 0, 53, 54, 0, 0, 0,
- 0, 0, 0, 0, 0, 59, 0, 0, 60, 26,
- 0, 61, 62, 0, 31, 32, 0, 349, 0, 0,
+ 48, 0, 0, 50, 51, 0, 548, 52, 0, 0,
+ 0, 0, 0, 0, 0, 6, 7, 8, 9, 0,
+ 0, 0, 10, 11, 12, 13, 14, 549, 15, 16,
+ 17, 0, 18, 19, 20, 62, 0, 0, 0, 565,
+ 0, 0, 0, 0, 0, 0, 0, 0, 574, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 0, 0, 0, 0, 0, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ 47, 48, 0, 49, 50, 51, 0, 0, 52, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 53,
+ 54, 55, 56, 57, 58, 0, 0, 0, 0, 59,
+ 0, 0, 60, 0, 384, 61, 62, 63, 64, 18,
+ 19, 385, 0, 0, 0, 386, 387, 388, 389, 390,
+ 391, 392, 0, 0, 393, 394, 0, 0, 0, 0,
+ 0, 26, 0, 0, 0, 0, 31, 32, 395, 396,
+ 397, 398, 0, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 399,
+ 49, 50, 51, 0, 0, 52, 400, 384, 0, 0,
+ 0, 0, 18, 19, 385, 0, 53, 54, 386, 387,
+ 388, 389, 390, 391, 392, 0, 59, 393, 394, 60,
+ 0, 401, 0, 62, 26, 0, 0, 489, 0, 31,
+ 32, 395, 396, 397, 398, 0, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ 47, 48, 399, 49, 50, 51, 0, 0, 52, 400,
+ 0, 18, 19, 20, 0, 0, 0, 0, 0, 53,
+ 54, 0, 0, 0, 0, 0, 0, 0, 0, 59,
+ 0, 0, 60, 26, 401, 0, 62, 0, 31, 32,
+ 0, 0, 0, 0, 0, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 0, 49, 50, 51, 0, 20, 52, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 53, 54,
+ 0, 0, 0, 0, 0, 0, 0, 0, 59, 0,
+ 0, 60, 125, 0, 61, 62, 0, 0, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 0, 0, 50, 51, 0, 20,
+ 52, 452, 248, 249, 250, 251, 252, 253, 254, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 255, 0, 125, 0, 0, 62, 0,
0, 33, 34, 35, 36, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, 47, 48, 0, 49, 50,
- 51, 0, 20, 52, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 53, 54, 0, 0, 0, 0,
- 0, 0, 0, 0, 59, 20, 0, 60, 120, 0,
- 61, 62, 0, 0, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 0, 120, 50, 51, 0, 0, 52, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 48, 0, 0, 50, 51, 59, 0, 0,
- 0, 0, 0, 0, 62, 0, 0, 0, 0, 0,
+ 42, 43, 44, 45, 46, 47, 48, 0, 0, 50,
+ 51, 20, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 453, 454, 0, 0, 0, 0, 0, 0,
+ 455, 456, 457, 458, 20, 0, 0, 125, 0, 0,
+ 0, 62, 0, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 0,
+ 125, 50, 51, 0, 0, 52, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ 47, 48, 0, 0, 50, 51, 59, 0, 0, 0,
+ 0, 0, 0, 62, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 62
+ 0, 0, 0, 0, 0, 0, 62
};
static const short int yycheck[] =
{
- 9, 3, 11, 12, 13, 14, 15, 16, 31, 32,
- 17, 158, 121, 156, 122, 24, 25, 26, 372, 199,
- 284, 22, 339, 339, 294, 22, 22, 22, 137, 339,
- 22, 462, 294, 339, 22, 339, 235, 60, 22, 30,
- 326, 22, 74, 24, 143, 52, 339, 74, 339, 74,
- 159, 53, 34, 35, 22, 22, 105, 59, 500, 323,
- 42, 113, 74, 0, 430, 107, 105, 116, 120, 339,
- 334, 180, 107, 74, 505, 339, 346, 339, 105, 121,
- 105, 190, 181, 449, 346, 19, 121, 113, 120, 80,
- 376, 23, 529, 120, 106, 121, 97, 120, 540, 298,
- 417, 417, 282, 23, 85, 542, 19, 417, 21, 23,
- 105, 417, 466, 417, 115, 111, 117, 109, 115, 227,
- 229, 230, 553, 111, 417, 109, 417, 109, 105, 97,
- 97, 22, 23, 107, 314, 315, 23, 245, 246, 247,
- 248, 249, 116, 115, 252, 117, 22, 417, 256, 57,
- 157, 153, 550, 417, 156, 417, 111, 112, 167, 114,
- 558, 22, 557, 60, 119, 22, 189, 484, 485, 485,
- 22, 569, 567, 106, 107, 34, 35, 531, 576, 120,
- 22, 106, 107, 42, 579, 116, 111, 112, 18, 114,
- 544, 22, 339, 112, 119, 114, 115, 116, 117, 118,
- 309, 310, 311, 312, 313, 228, 48, 316, 106, 107,
- 319, 74, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 66, 67, 68, 69, 106, 107,
- 72, 73, 23, 235, 76, 57, 78, 79, 80, 81,
- 82, 83, 84, 55, 56, 57, 106, 107, 60, 20,
- 21, 22, 108, 351, 352, 353, 22, 99, 260, 394,
- 395, 108, 104, 47, 105, 105, 22, 85, 112, 22,
- 417, 111, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 75, 123, 112, 125, 126, 106, 122, 469,
- 22, 434, 48, 108, 22, 106, 298, 113, 54, 55,
+ 8, 3, 10, 11, 12, 13, 14, 15, 16, 31,
+ 32, 204, 17, 163, 127, 30, 24, 25, 26, 165,
+ 374, 341, 341, 22, 286, 126, 296, 22, 296, 22,
+ 22, 22, 341, 341, 464, 341, 328, 341, 60, 22,
+ 22, 142, 22, 23, 24, 74, 238, 52, 63, 64,
+ 341, 53, 148, 74, 22, 22, 502, 59, 74, 34,
+ 35, 74, 22, 325, 110, 166, 559, 42, 83, 531,
+ 432, 341, 118, 341, 336, 74, 569, 507, 348, 341,
+ 348, 110, 544, 552, 185, 19, 378, 21, 581, 451,
+ 186, 560, 285, 122, 195, 111, 542, 110, 97, 419,
+ 419, 122, 571, 125, 115, 85, 22, 23, 300, 578,
+ 419, 419, 123, 419, 468, 419, 108, 230, 117, 112,
+ 119, 112, 117, 316, 317, 555, 108, 110, 419, 97,
+ 97, 232, 233, 108, 19, 248, 249, 250, 251, 252,
+ 0, 114, 255, 112, 113, 111, 259, 116, 114, 419,
+ 123, 419, 121, 114, 396, 397, 158, 419, 115, 164,
+ 111, 163, 123, 114, 172, 122, 486, 487, 487, 34,
+ 35, 23, 194, 111, 112, 113, 114, 42, 116, 533,
+ 117, 113, 119, 121, 116, 117, 118, 119, 120, 55,
+ 56, 57, 546, 114, 60, 341, 111, 118, 110, 114,
+ 20, 21, 22, 22, 20, 21, 22, 57, 23, 231,
+ 311, 312, 313, 314, 315, 23, 23, 318, 22, 60,
+ 321, 353, 354, 355, 22, 22, 42, 118, 122, 18,
+ 245, 47, 48, 23, 74, 57, 238, 107, 54, 55,
56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, 338, 72, 73, 327, 113,
- 76, 110, 431, 332, 333, 113, 113, 113, 113, 124,
- 113, 439, 440, 113, 113, 113, 113, 339, 105, 22,
- 108, 97, 105, 108, 105, 368, 110, 106, 104, 107,
- 8, 113, 106, 108, 22, 107, 113, 106, 108, 76,
- 42, 368, 113, 9, 106, 374, 110, 110, 113, 109,
- 105, 110, 106, 382, 554, 384, 385, 386, 387, 388,
- 389, 390, 391, 392, 106, 494, 495, 98, 568, 498,
- 10, 101, 110, 105, 503, 122, 53, 110, 119, 119,
- 105, 105, 109, 22, 113, 24, 122, 122, 122, 22,
- 519, 22, 107, 85, 110, 417, 106, 105, 105, 110,
- 123, 530, 106, 33, 110, 110, 105, 25, 105, 48,
- 110, 123, 434, 106, 543, 54, 55, 56, 57, 58,
+ 66, 67, 68, 69, 107, 71, 72, 73, 22, 110,
+ 76, 263, 85, 47, 113, 22, 75, 111, 113, 22,
+ 124, 87, 88, 419, 107, 22, 22, 115, 471, 109,
+ 111, 97, 110, 115, 100, 114, 436, 103, 104, 115,
+ 115, 115, 108, 107, 115, 48, 107, 115, 300, 126,
+ 110, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 65, 66, 67, 68, 69, 70, 340, 72,
+ 73, 329, 115, 76, 115, 111, 334, 335, 441, 442,
+ 115, 109, 433, 115, 110, 115, 107, 111, 7, 341,
+ 115, 22, 115, 111, 97, 114, 107, 76, 370, 42,
+ 8, 104, 111, 109, 109, 115, 108, 111, 98, 110,
+ 109, 111, 101, 556, 9, 370, 109, 53, 376, 110,
+ 115, 109, 22, 121, 110, 110, 384, 570, 386, 387,
+ 388, 389, 390, 391, 392, 393, 394, 124, 121, 108,
+ 124, 22, 124, 124, 114, 496, 497, 85, 109, 500,
+ 125, 111, 110, 110, 505, 111, 109, 109, 109, 33,
+ 110, 109, 125, 25, 110, 109, 111, 419, 109, 111,
+ 521, 126, 126, 1, 266, 336, 243, 240, 348, 3,
+ 110, 532, 112, 113, 436, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 545, 125, 162, 127, 128, 295,
+ 340, 181, 488, 320, 462, 419, 487, 184, 466, 246,
+ -1, -1, 563, 22, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 498, -1, -1, -1,
+ -1, -1, -1, -1, 486, 487, -1, -1, -1, 48,
+ -1, -1, -1, -1, -1, 54, 55, 56, 57, 58,
59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
- 69, 460, 561, 72, 73, 464, 110, 110, 124, 106,
- 124, 22, 1, 263, 334, 240, 85, 86, 237, 346,
- 3, 338, 293, 496, 93, 94, 95, 96, 176, 155,
- 486, 417, 484, 485, -1, 104, 318, 48, -1, -1,
- 179, 485, -1, 54, 55, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, -1,
- 243, 72, 73, 536, -1, 76, -1, -1, -1, -1,
- -1, -1, -1, 3, 4, 5, 6, 7, -1, -1,
- -1, 11, 12, 13, 14, 537, 16, 17, 18, -1,
- 20, 21, 22, 104, -1, -1, 555, -1, -1, -1,
- -1, -1, -1, -1, -1, 564, -1, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, -1,
- -1, -1, -1, -1, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
- -1, 71, 72, 73, -1, -1, 76, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 87, 88, 89,
- 90, 91, 92, -1, -1, -1, -1, 97, -1, -1,
- 100, 15, -1, 103, 104, -1, 20, 21, 22, -1,
- -1, -1, 26, 27, 28, 29, 30, 31, 32, -1,
- -1, 35, 36, -1, -1, -1, -1, -1, 42, -1,
- -1, -1, -1, 47, 48, 49, 50, 51, 52, -1,
- 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- -1, -1, 76, 77, 15, -1, -1, -1, -1, 20,
- 21, 22, -1, 87, 88, 26, 27, 28, 29, 30,
- 31, 32, -1, 97, 35, 36, 100, -1, 102, -1,
- 104, 42, -1, -1, -1, 109, 47, 48, 49, 50,
+ 69, -1, -1, 72, 73, -1, 538, 76, -1, -1,
+ -1, -1, -1, -1, -1, 3, 4, 5, 6, -1,
+ -1, -1, 10, 11, 12, 13, 14, 539, 16, 17,
+ 18, -1, 20, 21, 22, 104, -1, -1, -1, 557,
+ -1, -1, -1, -1, -1, -1, -1, -1, 566, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, -1, -1, -1, -1, -1, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, -1, 71, 72, 73, -1, -1, 76, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 87,
+ 88, 89, 90, 91, 92, -1, -1, -1, -1, 97,
+ -1, -1, 100, -1, 15, 103, 104, 105, 106, 20,
+ 21, 22, -1, -1, -1, 26, 27, 28, 29, 30,
+ 31, 32, -1, -1, 35, 36, -1, -1, -1, -1,
+ -1, 42, -1, -1, -1, -1, 47, 48, 49, 50,
51, 52, -1, 54, 55, 56, 57, 58, 59, 60,
61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- 71, 72, 73, -1, -1, 76, 77, -1, 20, 21,
- 22, -1, -1, -1, -1, -1, 87, 88, -1, -1,
- -1, -1, -1, -1, -1, -1, 97, -1, -1, 100,
- 42, 102, -1, 104, -1, 47, 48, -1, -1, -1,
- -1, -1, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 66, 67, 68, 69, -1, 71,
- 72, 73, -1, -1, 76, -1, -1, 20, 21, 22,
- -1, -1, -1, -1, -1, 87, 88, -1, -1, -1,
- -1, -1, -1, -1, -1, 97, -1, -1, 100, 42,
- -1, 103, 104, -1, 47, 48, -1, 109, -1, -1,
+ 71, 72, 73, -1, -1, 76, 77, 15, -1, -1,
+ -1, -1, 20, 21, 22, -1, 87, 88, 26, 27,
+ 28, 29, 30, 31, 32, -1, 97, 35, 36, 100,
+ -1, 102, -1, 104, 42, -1, -1, 108, -1, 47,
+ 48, 49, 50, 51, 52, -1, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 72, 73, -1, -1, 76, 77,
+ -1, 20, 21, 22, -1, -1, -1, -1, -1, 87,
+ 88, -1, -1, -1, -1, -1, -1, -1, -1, 97,
+ -1, -1, 100, 42, 102, -1, 104, -1, 47, 48,
+ -1, -1, -1, -1, -1, 54, 55, 56, 57, 58,
+ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+ 69, -1, 71, 72, 73, -1, 22, 76, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 87, 88,
+ -1, -1, -1, -1, -1, -1, -1, -1, 97, -1,
+ -1, 100, 48, -1, 103, 104, -1, -1, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, -1, -1, 72, 73, -1, 22,
+ 76, 24, 78, 79, 80, 81, 82, 83, 84, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 99, -1, 48, -1, -1, 104, -1,
-1, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, 69, -1, 71, 72,
- 73, -1, 22, 76, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 87, 88, -1, -1, -1, -1,
- -1, -1, -1, -1, 97, 22, -1, 100, 48, -1,
- 103, 104, -1, -1, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
- -1, 48, 72, 73, -1, -1, 76, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, -1, -1, 72, 73, 97, -1, -1,
- -1, -1, -1, -1, 104, -1, -1, -1, -1, -1,
+ 63, 64, 65, 66, 67, 68, 69, -1, -1, 72,
+ 73, 22, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 85, 86, -1, -1, -1, -1, -1, -1,
+ 93, 94, 95, 96, 22, -1, -1, 48, -1, -1,
+ -1, 104, -1, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, -1,
+ 48, 72, 73, -1, -1, 76, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, -1, -1, 72, 73, 97, -1, -1, -1,
+ -1, -1, -1, 104, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 104
+ -1, -1, -1, -1, -1, -1, 104
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const unsigned short int yystos[] =
{
- 0, 128, 129, 130, 0, 129, 3, 4, 5, 6,
- 7, 11, 12, 13, 14, 16, 17, 18, 20, 21,
+ 0, 130, 131, 132, 0, 131, 3, 4, 5, 6,
+ 10, 11, 12, 13, 14, 16, 17, 18, 20, 21,
22, 37, 38, 39, 40, 41, 42, 43, 44, 45,
46, 47, 48, 54, 55, 56, 57, 58, 59, 60,
61, 62, 63, 64, 65, 66, 67, 68, 69, 71,
72, 73, 76, 87, 88, 89, 90, 91, 92, 97,
- 100, 103, 104, 131, 132, 133, 135, 136, 139, 141,
- 146, 149, 153, 154, 158, 161, 162, 163, 164, 165,
- 166, 169, 170, 171, 175, 176, 177, 178, 187, 189,
- 190, 191, 192, 193, 194, 195, 198, 212, 213, 216,
- 217, 219, 221, 222, 238, 256, 257, 261, 105, 19,
- 196, 197, 196, 23, 196, 196, 196, 196, 196, 196,
- 48, 261, 105, 23, 23, 23, 196, 196, 196, 22,
- 23, 167, 167, 212, 212, 57, 22, 201, 60, 55,
- 56, 57, 60, 261, 257, 22, 155, 150, 22, 116,
- 242, 257, 212, 120, 167, 74, 120, 18, 220, 22,
- 97, 260, 22, 134, 19, 21, 23, 200, 212, 242,
- 22, 111, 159, 160, 201, 223, 218, 242, 57, 260,
- 22, 105, 147, 108, 108, 22, 243, 244, 105, 105,
- 137, 257, 262, 85, 168, 213, 262, 261, 222, 105,
- 242, 105, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 120, 121, 123, 125, 126, 239, 115, 117, 259,
- 106, 107, 196, 140, 22, 75, 106, 112, 122, 224,
- 224, 199, 259, 242, 260, 108, 22, 156, 157, 22,
- 151, 152, 113, 107, 116, 78, 79, 80, 81, 82,
- 83, 84, 99, 248, 249, 250, 257, 258, 212, 242,
- 107, 121, 121, 142, 248, 110, 106, 113, 113, 113,
- 113, 113, 113, 113, 113, 113, 120, 113, 121, 124,
- 113, 113, 105, 22, 108, 143, 22, 111, 201, 212,
- 225, 226, 242, 242, 108, 110, 22, 132, 148, 221,
- 109, 157, 109, 152, 22, 24, 85, 245, 244, 201,
- 201, 201, 201, 201, 105, 105, 201, 106, 107, 201,
- 113, 207, 106, 108, 257, 143, 106, 8, 172, 113,
- 113, 248, 34, 35, 144, 145, 178, 22, 107, 108,
- 227, 227, 22, 158, 161, 202, 203, 204, 106, 109,
- 132, 242, 242, 242, 242, 242, 248, 248, 242, 76,
- 240, 250, 242, 111, 112, 114, 119, 208, 210, 211,
- 178, 179, 240, 196, 9, 173, 106, 196, 196, 109,
- 145, 226, 15, 22, 26, 27, 28, 29, 30, 31,
- 32, 35, 36, 49, 50, 51, 52, 70, 77, 102,
- 136, 146, 158, 161, 178, 180, 181, 182, 183, 184,
- 185, 186, 188, 198, 216, 217, 222, 228, 229, 231,
- 232, 234, 237, 238, 251, 253, 254, 256, 110, 110,
- 113, 206, 109, 204, 105, 110, 207, 207, 207, 106,
- 106, 98, 263, 112, 114, 115, 116, 117, 118, 209,
- 24, 85, 86, 93, 94, 95, 96, 212, 214, 261,
- 101, 138, 263, 196, 10, 174, 240, 110, 196, 105,
- 196, 196, 196, 196, 196, 196, 196, 196, 196, 53,
- 230, 230, 230, 122, 255, 252, 233, 109, 229, 119,
- 211, 242, 110, 262, 201, 201, 105, 113, 241, 211,
- 105, 196, 109, 241, 196, 263, 248, 122, 122, 122,
- 238, 257, 70, 253, 22, 234, 22, 107, 205, 106,
- 242, 242, 212, 264, 85, 242, 208, 215, 110, 242,
- 241, 106, 22, 105, 242, 106, 107, 123, 236, 106,
- 107, 236, 242, 263, 106, 110, 212, 257, 110, 208,
- 110, 236, 242, 263, 105, 33, 246, 246, 110, 123,
- 235, 241, 248, 196, 25, 247, 247, 246, 105, 110,
- 242, 106, 196, 247, 248, 246, 110, 124, 106, 246,
- 124, 247
+ 100, 103, 104, 105, 106, 133, 134, 135, 136, 139,
+ 141, 146, 149, 153, 154, 158, 161, 162, 163, 164,
+ 165, 166, 167, 168, 171, 172, 173, 177, 178, 179,
+ 180, 189, 191, 192, 193, 194, 195, 196, 197, 198,
+ 201, 215, 216, 219, 220, 222, 224, 225, 241, 259,
+ 260, 264, 22, 19, 199, 200, 199, 23, 199, 199,
+ 199, 199, 199, 199, 199, 48, 264, 110, 23, 23,
+ 23, 199, 199, 199, 22, 23, 169, 169, 215, 215,
+ 57, 22, 204, 60, 55, 56, 57, 60, 264, 260,
+ 22, 155, 150, 22, 118, 245, 260, 215, 122, 169,
+ 169, 169, 74, 122, 18, 223, 22, 97, 263, 19,
+ 21, 23, 203, 215, 245, 22, 112, 159, 160, 204,
+ 226, 221, 245, 57, 263, 22, 110, 147, 107, 107,
+ 22, 246, 247, 110, 110, 137, 260, 265, 85, 170,
+ 216, 265, 264, 225, 110, 245, 110, 112, 113, 115,
+ 116, 117, 118, 119, 120, 121, 122, 123, 125, 127,
+ 128, 242, 117, 119, 262, 199, 140, 22, 75, 111,
+ 113, 124, 227, 227, 202, 262, 245, 263, 107, 22,
+ 156, 157, 22, 151, 152, 115, 114, 118, 78, 79,
+ 80, 81, 82, 83, 84, 99, 251, 252, 253, 260,
+ 261, 215, 245, 114, 123, 123, 142, 251, 109, 111,
+ 115, 115, 115, 115, 115, 115, 115, 115, 115, 122,
+ 115, 123, 126, 115, 115, 110, 107, 143, 22, 112,
+ 204, 215, 228, 229, 245, 245, 107, 109, 22, 134,
+ 148, 224, 108, 157, 108, 152, 24, 85, 169, 248,
+ 247, 204, 204, 204, 204, 204, 110, 110, 204, 111,
+ 114, 204, 115, 210, 111, 107, 260, 143, 111, 7,
+ 174, 115, 115, 251, 34, 35, 144, 145, 180, 22,
+ 114, 107, 230, 230, 22, 158, 161, 205, 206, 207,
+ 111, 108, 134, 245, 245, 245, 245, 245, 251, 251,
+ 245, 76, 243, 253, 245, 112, 113, 116, 121, 211,
+ 213, 214, 180, 181, 243, 199, 8, 175, 111, 199,
+ 199, 108, 145, 229, 15, 22, 26, 27, 28, 29,
+ 30, 31, 32, 35, 36, 49, 50, 51, 52, 70,
+ 77, 102, 136, 146, 158, 161, 180, 182, 183, 184,
+ 185, 186, 187, 188, 190, 201, 219, 220, 225, 231,
+ 232, 234, 235, 237, 240, 241, 254, 256, 257, 259,
+ 109, 109, 115, 209, 108, 207, 110, 109, 210, 210,
+ 210, 111, 111, 98, 266, 113, 116, 117, 118, 119,
+ 120, 212, 24, 85, 86, 93, 94, 95, 96, 215,
+ 217, 264, 101, 138, 266, 199, 9, 176, 243, 109,
+ 199, 110, 199, 199, 199, 199, 199, 199, 199, 199,
+ 199, 53, 233, 233, 233, 124, 258, 255, 236, 108,
+ 232, 121, 214, 245, 109, 265, 204, 204, 110, 115,
+ 244, 214, 110, 199, 108, 244, 199, 266, 251, 124,
+ 124, 124, 241, 260, 70, 256, 22, 237, 22, 114,
+ 208, 111, 245, 245, 215, 267, 85, 245, 211, 218,
+ 109, 245, 244, 111, 22, 110, 245, 111, 114, 125,
+ 239, 111, 114, 239, 245, 266, 111, 109, 215, 260,
+ 109, 211, 109, 239, 245, 266, 110, 33, 249, 249,
+ 109, 125, 238, 244, 251, 199, 25, 250, 250, 249,
+ 110, 109, 245, 111, 199, 250, 251, 249, 109, 126,
+ 111, 249, 126, 250
};
#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
@@ -1979,7 +1996,7 @@ yyreduce:
switch (yyn)
{
case 4:
-#line 314 "parser.y"
+#line 317 "parser.y"
{
/*
* We don't do these in parserEOF() because the parser is reading
@@ -1999,32 +2016,32 @@ yyreduce:
}
break;
- case 19:
-#line 346 "parser.y"
+ case 20:
+#line 350 "parser.y"
{
if (notSkipping())
appendCodeBlock(¤tSpec->exphdrcode, yyvsp[0].codeb);
}
break;
- case 20:
-#line 350 "parser.y"
+ case 21:
+#line 354 "parser.y"
{
if (notSkipping())
appendCodeBlock(¤tModule->hdrcode, yyvsp[0].codeb);
}
break;
- case 21:
-#line 354 "parser.y"
+ case 22:
+#line 358 "parser.y"
{
if (notSkipping())
appendCodeBlock(¤tModule->cppcode, yyvsp[0].codeb);
}
break;
- case 43:
-#line 381 "parser.y"
+ case 45:
+#line 386 "parser.y"
{
if (notSkipping())
{
@@ -2038,33 +2055,15 @@ yyreduce:
}
break;
- case 45:
-#line 397 "parser.y"
- {
- appendString(¤tSpec->options, yyvsp[0].text);
- }
- break;
-
case 46:
-#line 400 "parser.y"
+#line 399 "parser.y"
{
- appendString(¤tSpec->options, yyvsp[0].text);
+ appendString(¤tSpec->plugins, yyvsp[0].text);
}
break;
case 47:
-#line 405 "parser.y"
- {
- if (notSkipping())
- {
- yywarning("%SIPNoEmitters is deprecated, please use %SIPOptions instead");
- appendString(¤tSpec->options, "QtNoEmitters");
- }
- }
- break;
-
- case 48:
-#line 414 "parser.y"
+#line 404 "parser.y"
{
if (notSkipping())
{
@@ -2100,16 +2099,16 @@ yyreduce:
}
break;
- case 49:
-#line 449 "parser.y"
+ case 48:
+#line 439 "parser.y"
{
yyval.exceptionbase.bibase = NULL;
yyval.exceptionbase.base = NULL;
}
break;
- case 50:
-#line 453 "parser.y"
+ case 49:
+#line 443 "parser.y"
{
exceptionDef *xd;
@@ -2118,7 +2117,7 @@ yyreduce:
/* See if it is a defined exception. */
for (xd = currentSpec->exceptions; xd != NULL; xd = xd->next)
- if (sameScopedName(xd->iff->fqcname, yyvsp[-1].scpvalp))
+ if (compareScopedNames(xd->iff->fqcname, yyvsp[-1].scpvalp) == 0)
{
yyval.exceptionbase.base = xd;
break;
@@ -2184,23 +2183,23 @@ yyreduce:
}
break;
- case 51:
-#line 527 "parser.y"
+ case 50:
+#line 517 "parser.y"
{
yyval.codeb = yyvsp[0].codeb;
}
break;
- case 52:
-#line 532 "parser.y"
+ case 51:
+#line 522 "parser.y"
{
if (notSkipping())
currentMappedType = newMappedType(currentSpec, &yyvsp[-1].memArg, &yyvsp[0].optflags);
}
break;
- case 54:
-#line 538 "parser.y"
+ case 53:
+#line 528 "parser.y"
{
int a;
@@ -2226,7 +2225,7 @@ yyreduce:
/* Check a template hasn't already been provided. */
for (mtt = currentSpec->mappedtypetemplates; mtt != NULL; mtt = mtt->next)
- if (sameScopedName(mtt->mt->type.u.td->fqname, yyvsp[0].memArg.u.td->fqname) && sameTemplateSignature(&mtt->mt->type.u.td->types, &yyvsp[0].memArg.u.td->types, TRUE))
+ if (compareScopedNames(mtt->mt->type.u.td->fqname, yyvsp[0].memArg.u.td->fqname) == 0 && sameTemplateSignature(&mtt->mt->type.u.td->types, &yyvsp[0].memArg.u.td->types, TRUE))
yyerror("%MappedType template for this type has already been defined");
yyvsp[0].memArg.nrderefs = 0;
@@ -2235,7 +2234,7 @@ yyreduce:
mtt = sipMalloc(sizeof (mappedTypeTmplDef));
mtt->sig = yyvsp[-2].signature;
- mtt->mt = allocMappedType(&yyvsp[0].memArg);
+ mtt->mt = allocMappedType(currentSpec, &yyvsp[0].memArg);
mtt->next = currentSpec->mappedtypetemplates;
currentSpec->mappedtypetemplates = mtt;
@@ -2250,8 +2249,8 @@ yyreduce:
}
break;
- case 56:
-#line 587 "parser.y"
+ case 55:
+#line 577 "parser.y"
{
if (notSkipping())
{
@@ -2266,16 +2265,16 @@ yyreduce:
}
break;
- case 59:
-#line 605 "parser.y"
+ case 58:
+#line 595 "parser.y"
{
if (notSkipping())
appendCodeBlock(¤tMappedType->iff->hdrcode, yyvsp[0].codeb);
}
break;
- case 60:
-#line 609 "parser.y"
+ case 59:
+#line 599 "parser.y"
{
if (notSkipping())
{
@@ -2287,8 +2286,8 @@ yyreduce:
}
break;
- case 61:
-#line 618 "parser.y"
+ case 60:
+#line 608 "parser.y"
{
if (notSkipping())
{
@@ -2300,8 +2299,8 @@ yyreduce:
}
break;
- case 62:
-#line 629 "parser.y"
+ case 61:
+#line 619 "parser.y"
{
if (currentSpec -> genc)
yyerror("namespace definition not allowed in a C module");
@@ -2320,8 +2319,8 @@ yyreduce:
}
break;
- case 63:
-#line 644 "parser.y"
+ case 62:
+#line 634 "parser.y"
{
if (notSkipping())
{
@@ -2329,17 +2328,8 @@ yyreduce:
{
classDef *ns = currentScope();
- if (!isUsedName(ns->iff->name))
- {
- varDef *vd;
-
- for (vd = currentSpec->vars; vd != NULL; vd = vd->next)
- if (vd->ecd == ns)
- {
- setIsUsedName(ns->iff->name);
- break;
- }
- }
+ setIsUsedName(ns->iff->name);
+ setIsUsedName(ns->pyname);
}
popScope();
@@ -2347,8 +2337,8 @@ yyreduce:
}
break;
- case 66:
-#line 673 "parser.y"
+ case 65:
+#line 654 "parser.y"
{
qualDef *qd;
@@ -2358,8 +2348,8 @@ yyreduce:
}
break;
- case 67:
-#line 680 "parser.y"
+ case 66:
+#line 661 "parser.y"
{
qualDef *qd;
int nrneeded;
@@ -2380,29 +2370,29 @@ yyreduce:
}
break;
- case 70:
-#line 704 "parser.y"
+ case 69:
+#line 685 "parser.y"
{
newQualifier(currentModule,-1,-1,yyvsp[0].text,platform_qualifier);
}
break;
- case 71:
-#line 709 "parser.y"
+ case 70:
+#line 690 "parser.y"
{
newQualifier(currentModule,-1,-1,yyvsp[0].text,feature_qualifier);
}
break;
- case 72:
-#line 714 "parser.y"
+ case 71:
+#line 695 "parser.y"
{
currentTimelineOrder = 0;
}
break;
- case 73:
-#line 717 "parser.y"
+ case 72:
+#line 698 "parser.y"
{
qualDef *qd;
int nrneeded;
@@ -2425,15 +2415,15 @@ yyreduce:
}
break;
- case 76:
-#line 743 "parser.y"
+ case 75:
+#line 724 "parser.y"
{
newQualifier(currentModule,currentModule -> nrtimelines,currentTimelineOrder++,yyvsp[0].text,time_qualifier);
}
break;
- case 77:
-#line 748 "parser.y"
+ case 76:
+#line 729 "parser.y"
{
if (skipStackPtr >= MAX_NESTED_IF)
yyerror("Internal error: increase the value of MAX_NESTED_IF");
@@ -2447,51 +2437,51 @@ yyreduce:
}
break;
- case 78:
-#line 761 "parser.y"
+ case 77:
+#line 742 "parser.y"
{
yyval.boolean = platOrFeature(yyvsp[0].text,FALSE);
}
break;
- case 79:
-#line 764 "parser.y"
+ case 78:
+#line 745 "parser.y"
{
yyval.boolean = platOrFeature(yyvsp[0].text,TRUE);
}
break;
- case 80:
-#line 767 "parser.y"
+ case 79:
+#line 748 "parser.y"
{
yyval.boolean = (platOrFeature(yyvsp[0].text,FALSE) || yyvsp[-2].boolean);
}
break;
- case 81:
-#line 770 "parser.y"
+ case 80:
+#line 751 "parser.y"
{
yyval.boolean = (platOrFeature(yyvsp[0].text,TRUE) || yyvsp[-3].boolean);
}
break;
- case 83:
-#line 776 "parser.y"
+ case 82:
+#line 757 "parser.y"
{
yyval.boolean = timePeriod(yyvsp[-2].text,yyvsp[0].text);
}
break;
- case 84:
-#line 781 "parser.y"
+ case 83:
+#line 762 "parser.y"
{
if (skipStackPtr-- <= 0)
yyerror("Too many %End directives");
}
break;
- case 85:
-#line 787 "parser.y"
+ case 84:
+#line 768 "parser.y"
{
optFlag *of;
@@ -2519,8 +2509,34 @@ yyreduce:
}
break;
+ case 85:
+#line 795 "parser.y"
+ {
+ if (notSkipping())
+ {
+ if (currentModule->defmetatype != NULL)
+ yyerror("%DefaultMetatype has already been defined for this module");
+
+ currentModule->defmetatype = cacheName(currentSpec, yyvsp[0].text);
+ }
+ }
+ break;
+
case 86:
-#line 814 "parser.y"
+#line 806 "parser.y"
+ {
+ if (notSkipping())
+ {
+ if (currentModule->defsupertype != NULL)
+ yyerror("%DefaultSupertype has already been defined for this module");
+
+ currentModule->defsupertype = cacheName(currentSpec, yyvsp[0].text);
+ }
+ }
+ break;
+
+ case 87:
+#line 817 "parser.y"
{
/* Make sure this is the first mention of a module. */
if (currentSpec->module != currentModule)
@@ -2529,13 +2545,13 @@ yyreduce:
if (currentModule->fullname != NULL)
yyerror("%ConsolidatedModule must appear before any %Module or %CModule directive");
- setModuleName(currentModule, yyvsp[0].text);
+ setModuleName(currentSpec, currentModule, yyvsp[0].text);
setIsConsolidated(currentModule);
}
break;
- case 87:
-#line 827 "parser.y"
+ case 88:
+#line 830 "parser.y"
{
/* Make sure this is the first mention of a module. */
if (currentSpec->module != currentModule)
@@ -2544,20 +2560,20 @@ yyreduce:
if (currentModule->fullname != NULL)
yyerror("%CompositeModule must appear before any %Module or %CModule directive");
- setModuleName(currentModule, yyvsp[0].text);
+ setModuleName(currentSpec, currentModule, yyvsp[0].text);
setIsComposite(currentModule);
}
break;
- case 88:
-#line 840 "parser.y"
+ case 89:
+#line 843 "parser.y"
{
/* Check the module hasn't already been defined. */
moduleDef *mod;
for (mod = currentSpec->modules; mod != NULL; mod = mod->next)
- if (mod->fullname != NULL && strcmp(mod->fullname, yyvsp[-1].text) == 0)
+ if (mod->fullname != NULL && strcmp(mod->fullname->text, yyvsp[-1].text) == 0)
yyerror("Module is already defined");
/*
@@ -2574,7 +2590,7 @@ yyreduce:
currentModule = mod;
}
- setModuleName(currentModule, yyvsp[-1].text);
+ setModuleName(currentSpec, currentModule, yyvsp[-1].text);
currentModule->version = yyvsp[0].number;
if (currentSpec->genc < 0)
@@ -2584,232 +2600,240 @@ yyreduce:
}
break;
- case 89:
-#line 873 "parser.y"
+ case 90:
+#line 876 "parser.y"
{
yyval.boolean = FALSE;
}
break;
- case 90:
-#line 876 "parser.y"
+ case 91:
+#line 879 "parser.y"
{
yyval.boolean = TRUE;
}
break;
- case 92:
-#line 882 "parser.y"
+ case 93:
+#line 885 "parser.y"
{
/*
- * The grammar design is a bit broken and this is the
- * easiest way to allow periods in module names.
+ * The grammar design is a bit broken and this is the easiest way
+ * to allow periods in names.
*/
char *cp;
for (cp = yyvsp[0].text; *cp != '\0'; ++cp)
if (*cp != '.' && *cp != '_' && !isalnum(*cp))
- yyerror("Invalid character in module name");
+ yyerror("Invalid character in name");
yyval.text = yyvsp[0].text;
}
break;
- case 93:
-#line 898 "parser.y"
+ case 94:
+#line 901 "parser.y"
{
yyval.number = -1;
}
break;
- case 95:
-#line 904 "parser.y"
- {
- parseFile(NULL, yyvsp[0].text, NULL, FALSE);
- }
- break;
-
case 96:
-#line 909 "parser.y"
+#line 907 "parser.y"
{
- parseFile(NULL, yyvsp[0].text, NULL, TRUE);
+ parseFile(NULL, yyvsp[0].text, NULL, FALSE);
}
break;
case 97:
-#line 914 "parser.y"
+#line 912 "parser.y"
{
- newImport(yyvsp[0].text);
+ parseFile(NULL, yyvsp[0].text, NULL, TRUE);
}
break;
case 98:
-#line 919 "parser.y"
+#line 917 "parser.y"
{
- yyval.codeb = NULL;
+ newImport(yyvsp[0].text);
}
break;
case 99:
#line 922 "parser.y"
{
- yyval.codeb = yyvsp[0].codeb;
+ yyval.codeb = NULL;
}
break;
case 100:
-#line 927 "parser.y"
+#line 925 "parser.y"
{
- yyval.codeb = NULL;
+ yyval.codeb = yyvsp[0].codeb;
}
break;
case 101:
#line 930 "parser.y"
{
- yyval.codeb = yyvsp[0].codeb;
+ yyval.codeb = NULL;
}
break;
case 102:
-#line 935 "parser.y"
+#line 933 "parser.y"
{
- yyval.codeb = NULL;
+ yyval.codeb = yyvsp[0].codeb;
}
break;
case 103:
#line 938 "parser.y"
{
- yyval.codeb = yyvsp[0].codeb;
+ yyval.codeb = NULL;
}
break;
case 104:
-#line 943 "parser.y"
+#line 941 "parser.y"
{
- appendCodeBlock(¤tModule->copying, yyvsp[0].codeb);
+ yyval.codeb = yyvsp[0].codeb;
}
break;
case 105:
-#line 948 "parser.y"
+#line 946 "parser.y"
{
- yyval.codeb = yyvsp[0].codeb;
+ appendCodeBlock(¤tModule->copying, yyvsp[0].codeb);
}
break;
case 106:
-#line 953 "parser.y"
+#line 951 "parser.y"
{
yyval.codeb = yyvsp[0].codeb;
}
break;
case 107:
-#line 958 "parser.y"
+#line 956 "parser.y"
{
yyval.codeb = yyvsp[0].codeb;
}
break;
case 108:
-#line 963 "parser.y"
+#line 961 "parser.y"
{
- yyval.codeb = NULL;
+ yyval.codeb = yyvsp[0].codeb;
}
break;
- case 110:
-#line 969 "parser.y"
+ case 109:
+#line 966 "parser.y"
{
- yyval.codeb = yyvsp[0].codeb;
+ yyval.codeb = NULL;
}
break;
case 111:
-#line 974 "parser.y"
+#line 972 "parser.y"
{
yyval.codeb = yyvsp[0].codeb;
}
break;
case 112:
-#line 979 "parser.y"
+#line 977 "parser.y"
{
yyval.codeb = yyvsp[0].codeb;
}
break;
case 113:
-#line 984 "parser.y"
+#line 982 "parser.y"
{
yyval.codeb = yyvsp[0].codeb;
}
break;
case 114:
-#line 989 "parser.y"
+#line 987 "parser.y"
{
yyval.codeb = yyvsp[0].codeb;
}
break;
case 115:
-#line 994 "parser.y"
+#line 992 "parser.y"
{
yyval.codeb = yyvsp[0].codeb;
}
break;
case 116:
-#line 999 "parser.y"
+#line 997 "parser.y"
{
yyval.codeb = yyvsp[0].codeb;
}
break;
case 117:
-#line 1004 "parser.y"
+#line 1002 "parser.y"
{
yyval.codeb = yyvsp[0].codeb;
}
break;
case 118:
-#line 1009 "parser.y"
+#line 1007 "parser.y"
{
yyval.codeb = yyvsp[0].codeb;
}
break;
case 119:
-#line 1014 "parser.y"
+#line 1012 "parser.y"
+ {
+ yyval.codeb = yyvsp[0].codeb;
+ }
+ break;
+
+ case 120:
+#line 1017 "parser.y"
{
if (notSkipping())
appendCodeBlock(¤tModule->preinitcode, yyvsp[0].codeb);
}
break;
- case 120:
-#line 1020 "parser.y"
+ case 121:
+#line 1023 "parser.y"
+ {
+ if (notSkipping())
+ appendCodeBlock(¤tModule->initcode, yyvsp[0].codeb);
+ }
+ break;
+
+ case 122:
+#line 1029 "parser.y"
{
if (notSkipping())
appendCodeBlock(¤tModule->postinitcode, yyvsp[0].codeb);
}
break;
- case 121:
-#line 1026 "parser.y"
+ case 123:
+#line 1035 "parser.y"
{
if (notSkipping())
appendCodeBlock(¤tModule->unitcode, yyvsp[0].codeb);
}
break;
- case 122:
-#line 1032 "parser.y"
+ case 124:
+#line 1041 "parser.y"
{
/*
* This is a no-op and is retained for compatibility
@@ -2819,31 +2843,31 @@ yyreduce:
}
break;
- case 123:
-#line 1041 "parser.y"
+ case 125:
+#line 1050 "parser.y"
{
if (inMainModule())
appendCodeBlock(¤tSpec -> docs,yyvsp[0].codeb);
}
break;
- case 124:
-#line 1047 "parser.y"
+ case 126:
+#line 1056 "parser.y"
{
appendCodeBlock(¤tSpec -> docs,yyvsp[0].codeb);
}
break;
- case 125:
-#line 1052 "parser.y"
+ case 127:
+#line 1061 "parser.y"
{
if (inMainModule())
yywarning("%Makefile is ignored, please use the -b flag instead");
}
break;
- case 128:
-#line 1062 "parser.y"
+ case 130:
+#line 1071 "parser.y"
{
yyval.codeb = yyvsp[-1].codeb;
@@ -2855,8 +2879,8 @@ yyreduce:
}
break;
- case 129:
-#line 1073 "parser.y"
+ case 131:
+#line 1082 "parser.y"
{
if (notSkipping())
{
@@ -2868,36 +2892,36 @@ yyreduce:
}
break;
- case 131:
-#line 1084 "parser.y"
+ case 133:
+#line 1093 "parser.y"
{
yyval.text = NULL;
}
break;
- case 132:
-#line 1087 "parser.y"
+ case 134:
+#line 1096 "parser.y"
{
yyval.text = yyvsp[0].text;
}
break;
- case 133:
-#line 1092 "parser.y"
+ case 135:
+#line 1101 "parser.y"
{
yyval.text = NULL;
}
break;
- case 134:
-#line 1095 "parser.y"
+ case 136:
+#line 1104 "parser.y"
{
yyval.text = yyvsp[0].text;
}
break;
- case 141:
-#line 1110 "parser.y"
+ case 143:
+#line 1119 "parser.y"
{
if (notSkipping())
{
@@ -2925,22 +2949,22 @@ yyreduce:
}
break;
- case 146:
-#line 1145 "parser.y"
+ case 148:
+#line 1154 "parser.y"
{
yyval.valp = NULL;
}
break;
- case 147:
-#line 1148 "parser.y"
+ case 149:
+#line 1157 "parser.y"
{
yyval.valp = yyvsp[0].valp;
}
break;
- case 149:
-#line 1154 "parser.y"
+ case 151:
+#line 1163 "parser.y"
{
valueDef *vd;
@@ -2959,85 +2983,85 @@ yyreduce:
}
break;
- case 150:
-#line 1172 "parser.y"
+ case 152:
+#line 1181 "parser.y"
{
yyval.qchar = '-';
}
break;
- case 151:
-#line 1175 "parser.y"
+ case 153:
+#line 1184 "parser.y"
{
yyval.qchar = '+';
}
break;
- case 152:
-#line 1178 "parser.y"
+ case 154:
+#line 1187 "parser.y"
{
yyval.qchar = '*';
}
break;
- case 153:
-#line 1181 "parser.y"
+ case 155:
+#line 1190 "parser.y"
{
yyval.qchar = '/';
}
break;
- case 154:
-#line 1184 "parser.y"
+ case 156:
+#line 1193 "parser.y"
{
yyval.qchar = '&';
}
break;
- case 155:
-#line 1187 "parser.y"
+ case 157:
+#line 1196 "parser.y"
{
yyval.qchar = '|';
}
break;
- case 156:
-#line 1192 "parser.y"
+ case 158:
+#line 1201 "parser.y"
{
yyval.qchar = '\0';
}
break;
- case 157:
-#line 1195 "parser.y"
+ case 159:
+#line 1204 "parser.y"
{
yyval.qchar = '!';
}
break;
- case 158:
-#line 1198 "parser.y"
+ case 160:
+#line 1207 "parser.y"
{
yyval.qchar = '~';
}
break;
- case 159:
-#line 1201 "parser.y"
+ case 161:
+#line 1210 "parser.y"
{
yyval.qchar = '-';
}
break;
- case 160:
-#line 1204 "parser.y"
+ case 162:
+#line 1213 "parser.y"
{
yyval.qchar = '+';
}
break;
- case 161:
-#line 1209 "parser.y"
+ case 163:
+#line 1218 "parser.y"
{
if (yyvsp[-1].qchar != '\0' && yyvsp[0].value.vtype == string_value)
yyerror("Invalid unary operator for string");
@@ -3056,8 +3080,8 @@ yyreduce:
}
break;
- case 163:
-#line 1228 "parser.y"
+ case 165:
+#line 1237 "parser.y"
{
if (currentSpec -> genc)
yyerror("Scoped names are not allowed in a C module");
@@ -3066,15 +3090,15 @@ yyreduce:
}
break;
- case 164:
-#line 1236 "parser.y"
+ case 166:
+#line 1245 "parser.y"
{
yyval.scpvalp = text2scopePart(yyvsp[0].text);
}
break;
- case 165:
-#line 1241 "parser.y"
+ case 167:
+#line 1250 "parser.y"
{
/*
* We let the C++ compiler decide if the value is a valid one - no
@@ -3086,8 +3110,8 @@ yyreduce:
}
break;
- case 166:
-#line 1250 "parser.y"
+ case 168:
+#line 1259 "parser.y"
{
fcallDef *fcd;
@@ -3100,64 +3124,64 @@ yyreduce:
}
break;
- case 167:
-#line 1260 "parser.y"
+ case 169:
+#line 1269 "parser.y"
{
yyval.value.vtype = real_value;
yyval.value.u.vreal = yyvsp[0].real;
}
break;
- case 168:
-#line 1264 "parser.y"
+ case 170:
+#line 1273 "parser.y"
{
yyval.value.vtype = numeric_value;
yyval.value.u.vnum = yyvsp[0].number;
}
break;
- case 169:
-#line 1268 "parser.y"
+ case 171:
+#line 1277 "parser.y"
{
yyval.value.vtype = numeric_value;
yyval.value.u.vnum = 1;
}
break;
- case 170:
-#line 1272 "parser.y"
+ case 172:
+#line 1281 "parser.y"
{
yyval.value.vtype = numeric_value;
yyval.value.u.vnum = 0;
}
break;
- case 171:
-#line 1276 "parser.y"
+ case 173:
+#line 1285 "parser.y"
{
yyval.value.vtype = numeric_value;
yyval.value.u.vnum = 0;
}
break;
- case 172:
-#line 1280 "parser.y"
+ case 174:
+#line 1289 "parser.y"
{
yyval.value.vtype = string_value;
yyval.value.u.vstr = yyvsp[0].text;
}
break;
- case 173:
-#line 1284 "parser.y"
+ case 175:
+#line 1293 "parser.y"
{
yyval.value.vtype = qchar_value;
yyval.value.u.vqchar = yyvsp[0].qchar;
}
break;
- case 174:
-#line 1290 "parser.y"
+ case 176:
+#line 1299 "parser.y"
{
/* No values. */
@@ -3165,8 +3189,8 @@ yyreduce:
}
break;
- case 175:
-#line 1295 "parser.y"
+ case 177:
+#line 1304 "parser.y"
{
/* The single or first expression. */
@@ -3175,8 +3199,8 @@ yyreduce:
}
break;
- case 176:
-#line 1301 "parser.y"
+ case 178:
+#line 1310 "parser.y"
{
/* Check that it wasn't ...(,expression...). */
@@ -3195,16 +3219,16 @@ yyreduce:
}
break;
- case 177:
-#line 1319 "parser.y"
+ case 179:
+#line 1328 "parser.y"
{
if (notSkipping())
newTypedef(currentSpec, currentModule, yyvsp[-2].text, &yyvsp[-3].memArg, &yyvsp[-1].optflags);
}
break;
- case 178:
-#line 1323 "parser.y"
+ case 180:
+#line 1332 "parser.y"
{
if (notSkipping())
{
@@ -3228,8 +3252,8 @@ yyreduce:
}
break;
- case 179:
-#line 1346 "parser.y"
+ case 181:
+#line 1355 "parser.y"
{
if (currentSpec -> genc && yyvsp[0].scpvalp->next != NULL)
yyerror("Namespaces not allowed in a C module");
@@ -3242,8 +3266,8 @@ yyreduce:
}
break;
- case 180:
-#line 1355 "parser.y"
+ case 182:
+#line 1364 "parser.y"
{
if (notSkipping())
{
@@ -3255,13 +3279,13 @@ yyreduce:
}
break;
- case 181:
-#line 1366 "parser.y"
+ case 183:
+#line 1375 "parser.y"
{currentIsTemplate = TRUE;}
break;
- case 182:
-#line 1366 "parser.y"
+ case 184:
+#line 1375 "parser.y"
{
if (currentSpec->genc)
yyerror("Class templates not allowed in a C module");
@@ -3289,15 +3313,15 @@ yyreduce:
}
break;
- case 183:
-#line 1393 "parser.y"
+ case 185:
+#line 1402 "parser.y"
{
yyval.signature = yyvsp[-1].signature;
}
break;
- case 184:
-#line 1398 "parser.y"
+ case 186:
+#line 1407 "parser.y"
{
if (currentSpec -> genc)
yyerror("Class definition not allowed in a C module");
@@ -3310,16 +3334,16 @@ yyreduce:
}
break;
- case 185:
-#line 1407 "parser.y"
+ case 187:
+#line 1416 "parser.y"
{
if (notSkipping())
yyval.klass = completeClass(yyvsp[-5].scpvalp, &yyvsp[-2].optflags, yyvsp[-1].boolean);
}
break;
- case 190:
-#line 1421 "parser.y"
+ case 192:
+#line 1430 "parser.y"
{
if (notSkipping())
{
@@ -3359,38 +3383,38 @@ yyreduce:
}
break;
- case 191:
-#line 1460 "parser.y"
+ case 193:
+#line 1469 "parser.y"
{
yyval.boolean = FALSE;
}
break;
- case 192:
-#line 1463 "parser.y"
+ case 194:
+#line 1472 "parser.y"
{
yyval.boolean = TRUE;
}
break;
- case 203:
-#line 1480 "parser.y"
+ case 205:
+#line 1489 "parser.y"
{
if (notSkipping())
appendCodeBlock(¤tScope()->cppcode, yyvsp[0].codeb);
}
break;
- case 204:
-#line 1484 "parser.y"
+ case 206:
+#line 1493 "parser.y"
{
if (notSkipping())
appendCodeBlock(¤tScope()->iff->hdrcode, yyvsp[0].codeb);
}
break;
- case 205:
-#line 1488 "parser.y"
+ case 207:
+#line 1497 "parser.y"
{
if (notSkipping())
{
@@ -3404,8 +3428,8 @@ yyreduce:
}
break;
- case 206:
-#line 1499 "parser.y"
+ case 208:
+#line 1508 "parser.y"
{
if (notSkipping())
{
@@ -3419,8 +3443,8 @@ yyreduce:
}
break;
- case 207:
-#line 1510 "parser.y"
+ case 209:
+#line 1519 "parser.y"
{
if (notSkipping())
{
@@ -3434,8 +3458,8 @@ yyreduce:
}
break;
- case 208:
-#line 1521 "parser.y"
+ case 210:
+#line 1530 "parser.y"
{
if (notSkipping())
{
@@ -3449,8 +3473,8 @@ yyreduce:
}
break;
- case 209:
-#line 1532 "parser.y"
+ case 211:
+#line 1541 "parser.y"
{
if (notSkipping())
{
@@ -3464,8 +3488,8 @@ yyreduce:
}
break;
- case 210:
-#line 1543 "parser.y"
+ case 212:
+#line 1552 "parser.y"
{
if (notSkipping())
{
@@ -3479,8 +3503,8 @@ yyreduce:
}
break;
- case 211:
-#line 1554 "parser.y"
+ case 213:
+#line 1563 "parser.y"
{
if (notSkipping())
{
@@ -3494,8 +3518,8 @@ yyreduce:
}
break;
- case 215:
-#line 1568 "parser.y"
+ case 217:
+#line 1577 "parser.y"
{
if (notSkipping())
{
@@ -3509,8 +3533,8 @@ yyreduce:
}
break;
- case 216:
-#line 1579 "parser.y"
+ case 218:
+#line 1588 "parser.y"
{
if (notSkipping())
{
@@ -3524,8 +3548,8 @@ yyreduce:
}
break;
- case 217:
-#line 1590 "parser.y"
+ case 219:
+#line 1599 "parser.y"
{
if (currentSpec -> genc)
yyerror("public section not allowed in a C module");
@@ -3535,8 +3559,8 @@ yyreduce:
}
break;
- case 218:
-#line 1597 "parser.y"
+ case 220:
+#line 1606 "parser.y"
{
if (currentSpec -> genc)
yyerror("protected section not allowed in a C module");
@@ -3546,8 +3570,8 @@ yyreduce:
}
break;
- case 219:
-#line 1604 "parser.y"
+ case 221:
+#line 1613 "parser.y"
{
if (currentSpec -> genc)
yyerror("private section not allowed in a C module");
@@ -3557,8 +3581,8 @@ yyreduce:
}
break;
- case 220:
-#line 1611 "parser.y"
+ case 222:
+#line 1620 "parser.y"
{
if (currentSpec -> genc)
yyerror("signals section not allowed in a C module");
@@ -3568,22 +3592,22 @@ yyreduce:
}
break;
- case 221:
-#line 1620 "parser.y"
+ case 223:
+#line 1629 "parser.y"
{
yyval.number = 0;
}
break;
- case 222:
-#line 1623 "parser.y"
+ case 224:
+#line 1632 "parser.y"
{
yyval.number = SECT_IS_SLOT;
}
break;
- case 223:
-#line 1628 "parser.y"
+ case 225:
+#line 1637 "parser.y"
{
/* Note that we allow non-virtual dtors in C modules. */
@@ -3633,13 +3657,13 @@ yyreduce:
}
break;
- case 224:
-#line 1677 "parser.y"
+ case 226:
+#line 1686 "parser.y"
{currentCtorIsExplicit = TRUE;}
break;
- case 227:
-#line 1681 "parser.y"
+ case 229:
+#line 1690 "parser.y"
{
/* Note that we allow ctors in C modules. */
@@ -3666,15 +3690,15 @@ yyreduce:
}
break;
- case 228:
-#line 1707 "parser.y"
+ case 230:
+#line 1716 "parser.y"
{
yyval.optsignature = NULL;
}
break;
- case 229:
-#line 1710 "parser.y"
+ case 231:
+#line 1719 "parser.y"
{
yyval.optsignature = sipMalloc(sizeof (signatureDef));
@@ -3682,15 +3706,15 @@ yyreduce:
}
break;
- case 230:
-#line 1717 "parser.y"
+ case 232:
+#line 1726 "parser.y"
{
yyval.optsignature = NULL;
}
break;
- case 231:
-#line 1720 "parser.y"
+ case 233:
+#line 1729 "parser.y"
{
yyval.optsignature = sipMalloc(sizeof (signatureDef));
@@ -3699,22 +3723,22 @@ yyreduce:
}
break;
- case 232:
-#line 1728 "parser.y"
+ case 234:
+#line 1737 "parser.y"
{
yyval.number = FALSE;
}
break;
- case 233:
-#line 1731 "parser.y"
+ case 235:
+#line 1740 "parser.y"
{
yyval.number = TRUE;
}
break;
- case 234:
-#line 1736 "parser.y"
+ case 236:
+#line 1745 "parser.y"
{
if (notSkipping())
{
@@ -3734,8 +3758,8 @@ yyreduce:
}
break;
- case 235:
-#line 1753 "parser.y"
+ case 237:
+#line 1762 "parser.y"
{
if (notSkipping())
{
@@ -3763,8 +3787,8 @@ yyreduce:
}
break;
- case 236:
-#line 1778 "parser.y"
+ case 238:
+#line 1787 "parser.y"
{
if (notSkipping())
{
@@ -3825,7 +3849,7 @@ yyreduce:
/* Check it doesn't already exist. */
for (al = scope->casts; al != NULL; al = al->next)
- if (sameScopedName(yyvsp[-11].memArg.u.snd, al->arg.u.snd))
+ if (compareScopedNames(yyvsp[-11].memArg.u.snd, al->arg.u.snd) == 0)
yyerror("This operator cast has already been specified in this class");
al = sipMalloc(sizeof (argList));
@@ -3841,174 +3865,174 @@ yyreduce:
}
break;
- case 237:
-#line 1854 "parser.y"
+ case 239:
+#line 1863 "parser.y"
{yyval.text = "__add__";}
break;
- case 238:
-#line 1855 "parser.y"
+ case 240:
+#line 1864 "parser.y"
{yyval.text = "__sub__";}
break;
- case 239:
-#line 1856 "parser.y"
+ case 241:
+#line 1865 "parser.y"
{yyval.text = "__mul__";}
break;
- case 240:
-#line 1857 "parser.y"
+ case 242:
+#line 1866 "parser.y"
{yyval.text = "__div__";}
break;
- case 241:
-#line 1858 "parser.y"
+ case 243:
+#line 1867 "parser.y"
{yyval.text = "__mod__";}
break;
- case 242:
-#line 1859 "parser.y"
+ case 244:
+#line 1868 "parser.y"
{yyval.text = "__and__";}
break;
- case 243:
-#line 1860 "parser.y"
+ case 245:
+#line 1869 "parser.y"
{yyval.text = "__or__";}
break;
- case 244:
-#line 1861 "parser.y"
+ case 246:
+#line 1870 "parser.y"
{yyval.text = "__xor__";}
break;
- case 245:
-#line 1862 "parser.y"
+ case 247:
+#line 1871 "parser.y"
{yyval.text = "__lshift__";}
break;
- case 246:
-#line 1863 "parser.y"
+ case 248:
+#line 1872 "parser.y"
{yyval.text = "__rshift__";}
break;
- case 247:
-#line 1864 "parser.y"
+ case 249:
+#line 1873 "parser.y"
{yyval.text = "__iadd__";}
break;
- case 248:
-#line 1865 "parser.y"
+ case 250:
+#line 1874 "parser.y"
{yyval.text = "__isub__";}
break;
- case 249:
-#line 1866 "parser.y"
+ case 251:
+#line 1875 "parser.y"
{yyval.text = "__imul__";}
break;
- case 250:
-#line 1867 "parser.y"
+ case 252:
+#line 1876 "parser.y"
{yyval.text = "__idiv__";}
break;
- case 251:
-#line 1868 "parser.y"
+ case 253:
+#line 1877 "parser.y"
{yyval.text = "__imod__";}
break;
- case 252:
-#line 1869 "parser.y"
+ case 254:
+#line 1878 "parser.y"
{yyval.text = "__iand__";}
break;
- case 253:
-#line 1870 "parser.y"
+ case 255:
+#line 1879 "parser.y"
{yyval.text = "__ior__";}
break;
- case 254:
-#line 1871 "parser.y"
+ case 256:
+#line 1880 "parser.y"
{yyval.text = "__ixor__";}
break;
- case 255:
-#line 1872 "parser.y"
+ case 257:
+#line 1881 "parser.y"
{yyval.text = "__ilshift__";}
break;
- case 256:
-#line 1873 "parser.y"
+ case 258:
+#line 1882 "parser.y"
{yyval.text = "__irshift__";}
break;
- case 257:
-#line 1874 "parser.y"
+ case 259:
+#line 1883 "parser.y"
{yyval.text = "__invert__";}
break;
- case 258:
-#line 1875 "parser.y"
+ case 260:
+#line 1884 "parser.y"
{yyval.text = "__call__";}
break;
- case 259:
-#line 1876 "parser.y"
+ case 261:
+#line 1885 "parser.y"
{yyval.text = "__getitem__";}
break;
- case 260:
-#line 1877 "parser.y"
+ case 262:
+#line 1886 "parser.y"
{yyval.text = "__lt__";}
break;
- case 261:
-#line 1878 "parser.y"
+ case 263:
+#line 1887 "parser.y"
{yyval.text = "__le__";}
break;
- case 262:
-#line 1879 "parser.y"
+ case 264:
+#line 1888 "parser.y"
{yyval.text = "__eq__";}
break;
- case 263:
-#line 1880 "parser.y"
+ case 265:
+#line 1889 "parser.y"
{yyval.text = "__ne__";}
break;
- case 264:
-#line 1881 "parser.y"
+ case 266:
+#line 1890 "parser.y"
{yyval.text = "__gt__";}
break;
- case 265:
-#line 1882 "parser.y"
+ case 267:
+#line 1891 "parser.y"
{yyval.text = "__ge__";}
break;
- case 266:
-#line 1885 "parser.y"
+ case 268:
+#line 1894 "parser.y"
{
yyval.number = FALSE;
}
break;
- case 267:
-#line 1888 "parser.y"
+ case 269:
+#line 1897 "parser.y"
{
yyval.number = TRUE;
}
break;
- case 268:
-#line 1893 "parser.y"
+ case 270:
+#line 1902 "parser.y"
{
yyval.number = 0;
}
break;
- case 269:
-#line 1896 "parser.y"
+ case 271:
+#line 1905 "parser.y"
{
if (yyvsp[0].number != 0)
yyerror("Abstract virtual function '= 0' expected");
@@ -4017,30 +4041,30 @@ yyreduce:
}
break;
- case 270:
-#line 1904 "parser.y"
+ case 272:
+#line 1913 "parser.y"
{
yyval.optflags.nrFlags = 0;
}
break;
- case 271:
-#line 1907 "parser.y"
+ case 273:
+#line 1916 "parser.y"
{
yyval.optflags = yyvsp[-1].optflags;
}
break;
- case 272:
-#line 1913 "parser.y"
+ case 274:
+#line 1922 "parser.y"
{
yyval.optflags.flags[0] = yyvsp[0].flag;
yyval.optflags.nrFlags = 1;
}
break;
- case 273:
-#line 1917 "parser.y"
+ case 275:
+#line 1926 "parser.y"
{
/* Check there is room. */
@@ -4053,76 +4077,76 @@ yyreduce:
}
break;
- case 274:
-#line 1929 "parser.y"
+ case 276:
+#line 1938 "parser.y"
{
yyval.flag.ftype = bool_flag;
yyval.flag.fname = yyvsp[0].text;
}
break;
- case 275:
-#line 1933 "parser.y"
+ case 277:
+#line 1942 "parser.y"
{
yyval.flag = yyvsp[0].flag;
yyval.flag.fname = yyvsp[-2].text;
}
break;
- case 276:
-#line 1939 "parser.y"
+ case 278:
+#line 1948 "parser.y"
{
- yyval.flag.ftype = name_flag;
+ yyval.flag.ftype = (strchr(yyvsp[0].text, '.') != NULL) ? dotted_name_flag : name_flag;
yyval.flag.fvalue.sval = yyvsp[0].text;
}
break;
- case 277:
-#line 1943 "parser.y"
+ case 279:
+#line 1952 "parser.y"
{
yyval.flag.ftype = string_flag;
yyval.flag.fvalue.sval = yyvsp[0].text;
}
break;
- case 278:
-#line 1947 "parser.y"
+ case 280:
+#line 1956 "parser.y"
{
yyval.flag.ftype = integer_flag;
yyval.flag.fvalue.ival = yyvsp[0].number;
}
break;
- case 279:
-#line 1953 "parser.y"
+ case 281:
+#line 1962 "parser.y"
{
yyval.codeb = NULL;
}
break;
- case 280:
-#line 1956 "parser.y"
+ case 282:
+#line 1965 "parser.y"
{
yyval.codeb = yyvsp[0].codeb;
}
break;
- case 281:
-#line 1961 "parser.y"
+ case 283:
+#line 1970 "parser.y"
{
yyval.codeb = NULL;
}
break;
- case 282:
-#line 1964 "parser.y"
+ case 284:
+#line 1973 "parser.y"
{
yyval.codeb = yyvsp[0].codeb;
}
break;
- case 283:
-#line 1969 "parser.y"
+ case 285:
+#line 1978 "parser.y"
{
int a, nrrxcon, nrrxdis, nrslotcon, nrslotdis, nrarray, nrarraysize;
@@ -4171,8 +4195,8 @@ yyreduce:
}
break;
- case 284:
-#line 2017 "parser.y"
+ case 286:
+#line 2026 "parser.y"
{
/* No arguments. */
@@ -4180,8 +4204,8 @@ yyreduce:
}
break;
- case 285:
-#line 2022 "parser.y"
+ case 287:
+#line 2031 "parser.y"
{
/* The single or first argument. */
@@ -4190,8 +4214,8 @@ yyreduce:
}
break;
- case 286:
-#line 2028 "parser.y"
+ case 288:
+#line 2037 "parser.y"
{
/* Check that it wasn't ...(,arg...). */
if (yyvsp[-2].signature.nrArgs == 0)
@@ -4219,8 +4243,8 @@ yyreduce:
}
break;
- case 287:
-#line 2055 "parser.y"
+ case 289:
+#line 2064 "parser.y"
{
yyval.memArg.atype = signal_type;
yyval.memArg.argflags = ARG_IS_CONST;
@@ -4232,8 +4256,8 @@ yyreduce:
}
break;
- case 288:
-#line 2064 "parser.y"
+ case 290:
+#line 2073 "parser.y"
{
yyval.memArg.atype = slot_type;
yyval.memArg.argflags = ARG_IS_CONST;
@@ -4245,8 +4269,8 @@ yyreduce:
}
break;
- case 289:
-#line 2073 "parser.y"
+ case 291:
+#line 2082 "parser.y"
{
yyval.memArg.atype = anyslot_type;
yyval.memArg.argflags = ARG_IS_CONST;
@@ -4258,8 +4282,8 @@ yyreduce:
}
break;
- case 290:
-#line 2082 "parser.y"
+ case 292:
+#line 2091 "parser.y"
{
yyval.memArg.atype = rxcon_type;
yyval.memArg.argflags = 0;
@@ -4273,8 +4297,8 @@ yyreduce:
}
break;
- case 291:
-#line 2093 "parser.y"
+ case 293:
+#line 2102 "parser.y"
{
yyval.memArg.atype = rxdis_type;
yyval.memArg.argflags = 0;
@@ -4285,8 +4309,8 @@ yyreduce:
}
break;
- case 292:
-#line 2101 "parser.y"
+ case 294:
+#line 2110 "parser.y"
{
yyval.memArg.atype = slotcon_type;
yyval.memArg.argflags = ARG_IS_CONST;
@@ -4304,8 +4328,8 @@ yyreduce:
}
break;
- case 293:
-#line 2116 "parser.y"
+ case 295:
+#line 2125 "parser.y"
{
yyval.memArg.atype = slotdis_type;
yyval.memArg.argflags = ARG_IS_CONST;
@@ -4323,8 +4347,8 @@ yyreduce:
}
break;
- case 294:
-#line 2131 "parser.y"
+ case 296:
+#line 2140 "parser.y"
{
yyval.memArg.atype = qobject_type;
yyval.memArg.argflags = 0;
@@ -4333,26 +4357,26 @@ yyreduce:
}
break;
- case 295:
-#line 2137 "parser.y"
+ case 297:
+#line 2146 "parser.y"
{
yyval.memArg = yyvsp[-1].memArg;
yyval.memArg.defval = yyvsp[0].valp;
}
break;
- case 296:
-#line 2143 "parser.y"
+ case 298:
+#line 2152 "parser.y"
{currentIsStatic = TRUE;}
break;
- case 301:
-#line 2151 "parser.y"
+ case 303:
+#line 2160 "parser.y"
{currentOverIsVirt = TRUE;}
break;
- case 304:
-#line 2155 "parser.y"
+ case 306:
+#line 2164 "parser.y"
{
if (notSkipping())
{
@@ -4386,8 +4410,8 @@ yyreduce:
}
break;
- case 305:
-#line 2188 "parser.y"
+ case 307:
+#line 2197 "parser.y"
{
yyval.memArg = yyvsp[-2].memArg;
yyval.memArg.nrderefs += yyvsp[-1].number;
@@ -4396,8 +4420,8 @@ yyreduce:
}
break;
- case 306:
-#line 2194 "parser.y"
+ case 308:
+#line 2203 "parser.y"
{
yyval.memArg = yyvsp[-2].memArg;
yyval.memArg.nrderefs += yyvsp[-1].number;
@@ -4406,8 +4430,8 @@ yyreduce:
}
break;
- case 307:
-#line 2202 "parser.y"
+ case 309:
+#line 2211 "parser.y"
{
yyval.memArg = yyvsp[-2].memArg;
yyval.memArg.name = yyvsp[-1].text;
@@ -4468,15 +4492,15 @@ yyreduce:
}
break;
- case 308:
-#line 2262 "parser.y"
+ case 310:
+#line 2271 "parser.y"
{
yyval.number = 0;
}
break;
- case 309:
-#line 2265 "parser.y"
+ case 311:
+#line 2274 "parser.y"
{
if (currentSpec -> genc)
yyerror("References not allowed in a C module");
@@ -4485,22 +4509,22 @@ yyreduce:
}
break;
- case 310:
-#line 2273 "parser.y"
+ case 312:
+#line 2282 "parser.y"
{
yyval.number = 0;
}
break;
- case 311:
-#line 2276 "parser.y"
+ case 313:
+#line 2285 "parser.y"
{
yyval.number = yyvsp[-1].number + 1;
}
break;
- case 312:
-#line 2281 "parser.y"
+ case 314:
+#line 2290 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4514,8 +4538,8 @@ yyreduce:
}
break;
- case 313:
-#line 2292 "parser.y"
+ case 315:
+#line 2301 "parser.y"
{
templateDef *td;
@@ -4532,8 +4556,8 @@ yyreduce:
}
break;
- case 314:
-#line 2306 "parser.y"
+ case 316:
+#line 2315 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4553,8 +4577,8 @@ yyreduce:
}
break;
- case 315:
-#line 2323 "parser.y"
+ case 317:
+#line 2332 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4564,8 +4588,8 @@ yyreduce:
}
break;
- case 316:
-#line 2330 "parser.y"
+ case 318:
+#line 2339 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4575,8 +4599,8 @@ yyreduce:
}
break;
- case 317:
-#line 2337 "parser.y"
+ case 319:
+#line 2346 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4586,8 +4610,8 @@ yyreduce:
}
break;
- case 318:
-#line 2344 "parser.y"
+ case 320:
+#line 2353 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4597,8 +4621,8 @@ yyreduce:
}
break;
- case 319:
-#line 2351 "parser.y"
+ case 321:
+#line 2360 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4608,8 +4632,8 @@ yyreduce:
}
break;
- case 320:
-#line 2358 "parser.y"
+ case 322:
+#line 2367 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4619,8 +4643,8 @@ yyreduce:
}
break;
- case 321:
-#line 2365 "parser.y"
+ case 323:
+#line 2374 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4630,8 +4654,8 @@ yyreduce:
}
break;
- case 322:
-#line 2372 "parser.y"
+ case 324:
+#line 2381 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4641,8 +4665,8 @@ yyreduce:
}
break;
- case 323:
-#line 2379 "parser.y"
+ case 325:
+#line 2388 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4652,8 +4676,8 @@ yyreduce:
}
break;
- case 324:
-#line 2386 "parser.y"
+ case 326:
+#line 2395 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4663,8 +4687,8 @@ yyreduce:
}
break;
- case 325:
-#line 2393 "parser.y"
+ case 327:
+#line 2402 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4674,8 +4698,8 @@ yyreduce:
}
break;
- case 326:
-#line 2400 "parser.y"
+ case 328:
+#line 2409 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4685,8 +4709,8 @@ yyreduce:
}
break;
- case 327:
-#line 2407 "parser.y"
+ case 329:
+#line 2416 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4696,8 +4720,8 @@ yyreduce:
}
break;
- case 328:
-#line 2414 "parser.y"
+ case 330:
+#line 2423 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4707,8 +4731,8 @@ yyreduce:
}
break;
- case 329:
-#line 2421 "parser.y"
+ case 331:
+#line 2430 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4718,8 +4742,8 @@ yyreduce:
}
break;
- case 330:
-#line 2428 "parser.y"
+ case 332:
+#line 2437 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4729,8 +4753,8 @@ yyreduce:
}
break;
- case 331:
-#line 2435 "parser.y"
+ case 333:
+#line 2444 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4740,8 +4764,8 @@ yyreduce:
}
break;
- case 332:
-#line 2442 "parser.y"
+ case 334:
+#line 2451 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4751,8 +4775,8 @@ yyreduce:
}
break;
- case 333:
-#line 2449 "parser.y"
+ case 335:
+#line 2458 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4762,8 +4786,8 @@ yyreduce:
}
break;
- case 334:
-#line 2456 "parser.y"
+ case 336:
+#line 2465 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4773,8 +4797,8 @@ yyreduce:
}
break;
- case 335:
-#line 2463 "parser.y"
+ case 337:
+#line 2472 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4784,8 +4808,8 @@ yyreduce:
}
break;
- case 336:
-#line 2470 "parser.y"
+ case 338:
+#line 2479 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4795,8 +4819,8 @@ yyreduce:
}
break;
- case 337:
-#line 2477 "parser.y"
+ case 339:
+#line 2486 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4806,8 +4830,8 @@ yyreduce:
}
break;
- case 338:
-#line 2484 "parser.y"
+ case 340:
+#line 2493 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4817,8 +4841,8 @@ yyreduce:
}
break;
- case 339:
-#line 2491 "parser.y"
+ case 341:
+#line 2500 "parser.y"
{
yyval.memArg.nrderefs = 0;
yyval.memArg.argflags = 0;
@@ -4828,8 +4852,8 @@ yyreduce:
}
break;
- case 340:
-#line 2500 "parser.y"
+ case 342:
+#line 2509 "parser.y"
{
/* The single or first type. */
@@ -4838,8 +4862,8 @@ yyreduce:
}
break;
- case 341:
-#line 2506 "parser.y"
+ case 343:
+#line 2515 "parser.y"
{
/* Check there is nothing after an ellipsis. */
if (yyvsp[-2].signature.args[yyvsp[-2].signature.nrArgs - 1].atype == ellipsis_type)
@@ -4856,15 +4880,15 @@ yyreduce:
}
break;
- case 342:
-#line 2522 "parser.y"
+ case 344:
+#line 2531 "parser.y"
{
yyval.throwlist = NULL;
}
break;
- case 343:
-#line 2525 "parser.y"
+ case 345:
+#line 2534 "parser.y"
{
if (currentSpec->genc)
yyerror("Exceptions not allowed in a C module");
@@ -4873,8 +4897,8 @@ yyreduce:
}
break;
- case 344:
-#line 2533 "parser.y"
+ case 346:
+#line 2542 "parser.y"
{
/* Empty list so use a blank. */
@@ -4883,8 +4907,8 @@ yyreduce:
}
break;
- case 345:
-#line 2539 "parser.y"
+ case 347:
+#line 2548 "parser.y"
{
/* The only or first exception. */
@@ -4894,8 +4918,8 @@ yyreduce:
}
break;
- case 346:
-#line 2546 "parser.y"
+ case 348:
+#line 2555 "parser.y"
{
/* Check that it wasn't ...(,arg...). */
@@ -4916,7 +4940,7 @@ yyreduce:
}
/* Line 1010 of yacc.c. */
-#line 4920 "parser.c"
+#line 4944 "parser.c"
*
yyvsp -= yylen;
yyssp -= yylen;
@@ -5141,7 +5165,7 @@ yyreturn:
}
-#line 2562 "parser.y"
+#line 2571 "parser.y"
@@ -5155,22 +5179,22 @@ void parse(sipSpec *spec, FILE *fp, char *filename, stringList *tsl,
/* Initialise the spec. */
- spec -> modules = NULL;
- spec -> namecache = NULL;
- spec -> ifacefiles = NULL;
- spec -> classes = NULL;
- spec -> classtemplates = NULL;
- spec -> exceptions = NULL;
- spec -> mappedtypes = NULL;
- spec -> mappedtypetemplates = NULL;
- spec -> enums = NULL;
- spec -> vars = NULL;
- spec -> typedefs = NULL;
- spec -> exphdrcode = NULL;
- spec -> docs = NULL;
- spec -> sigslots = FALSE;
- spec -> genc = -1;
- spec -> options = NULL;
+ spec->modules = NULL;
+ spec->namecache = NULL;
+ spec->ifacefiles = NULL;
+ spec->classes = NULL;
+ spec->classtemplates = NULL;
+ spec->exceptions = NULL;
+ spec->mappedtypes = NULL;
+ spec->mappedtypetemplates = NULL;
+ spec->enums = NULL;
+ spec->vars = NULL;
+ spec->typedefs = NULL;
+ spec->exphdrcode = NULL;
+ spec->docs = NULL;
+ spec->sigslots = FALSE;
+ spec->genc = -1;
+ spec->plugins = NULL;
currentSpec = spec;
neededQualifiers = tsl;
@@ -5187,7 +5211,7 @@ void parse(sipSpec *spec, FILE *fp, char *filename, stringList *tsl,
sectionFlags = 0;
newModule(fp, filename);
- spec -> module = currentModule;
+ spec->module = currentModule;
yyparse();
@@ -5278,38 +5302,10 @@ static moduleDef *allocModule()
moduleDef *newmod, **tailp;
newmod = sipMalloc(sizeof (moduleDef));
- newmod->fullname = NULL;
- newmod->name = NULL;
+
newmod->version = -1;
- newmod->modflags = 0;
newmod->qobjclass = -1;
- newmod->othfuncs = NULL;
- newmod->overs = NULL;
- newmod->hdrcode = NULL;
- newmod->cppcode = NULL;
- newmod->copying = NULL;
- newmod->preinitcode = NULL;
- newmod->postinitcode = NULL;
- newmod->unitcode = NULL;
- newmod->file = NULL;
- newmod->qualifiers = NULL;
- newmod->root.cd = NULL;
- newmod->root.child = NULL;
- newmod->nrtimelines = 0;
- newmod->nrclasses = 0;
- newmod->nrexceptions = 0;
- newmod->nrmappedtypes = 0;
- newmod->nrenums = 0;
- newmod->nrtypedefs = 0;
newmod->nrvirthandlers = -1;
- newmod->virthandlers = NULL;
- newmod->license = NULL;
- newmod->proxies = NULL;
- newmod->container = NULL;
- newmod->used = NULL;
- newmod->allimports = NULL;
- newmod->imports = NULL;
- newmod->next = NULL;
/*
* The consolidated module support needs these to be in order that they
@@ -5352,7 +5348,7 @@ ifaceFileDef *findIfaceFile(sipSpec *pt, moduleDef *mod, scopedNameDef *fqname,
for (iff = pt->ifacefiles; iff != NULL; iff = iff->next)
{
- if (!sameScopedName(iff->fqcname, fqname))
+ if (compareScopedNames(iff->fqcname, fqname) != 0)
continue;
/*
@@ -5415,7 +5411,7 @@ ifaceFileDef *findIfaceFile(sipSpec *pt, moduleDef *mod, scopedNameDef *fqname,
iff = sipMalloc(sizeof (ifaceFileDef));
- iff->name = cacheName(pt, scopedNameTail(fqname));
+ iff->name = cacheName(pt, scopedNameToString(fqname));
iff->type = iftype;
iff->fqcname = fqname;
iff->module = NULL;
@@ -5454,37 +5450,8 @@ static classDef *findClassWithInterface(sipSpec *pt, ifaceFileDef *iff)
cd = sipMalloc(sizeof (classDef));
cd -> iff = iff;
- cd -> pyname = classBaseName(cd);
+ cd -> pyname = cacheName(pt, classBaseName(cd));
cd -> classnr = -1;
- cd -> classflags = 0;
- cd -> userflags = 0;
- cd -> ecd = NULL;
- cd -> dtorexceptions = NULL;
- cd -> real = NULL;
- cd -> node = NULL;
- cd -> supers = NULL;
- cd -> mro = NULL;
- cd -> td = NULL;
- cd -> ctors = NULL;
- cd -> defctor = NULL;
- cd -> dealloccode = NULL;
- cd -> dtorcode = NULL;
- cd -> members = NULL;
- cd -> overs = NULL;
- cd -> casts = NULL;
- cd -> vmembers = NULL;
- cd -> visible = NULL;
- cd -> cppcode = NULL;
- cd -> convtosubcode = NULL;
- cd -> subbase = NULL;
- cd -> convtocode = NULL;
- cd -> travcode = NULL;
- cd -> clearcode = NULL;
- cd -> readbufcode = NULL;
- cd -> writebufcode = NULL;
- cd -> segcountcode = NULL;
- cd -> charbufcode = NULL;
- cd -> picklecode = NULL;
cd -> next = pt -> classes;
pt -> classes = cd;
@@ -5649,7 +5616,7 @@ static classDef *newClass(sipSpec *pt,ifaceFileType iftype,
if (ns->iff->type != namespace_iface)
continue;
- if (!sameScopedName(ns->iff->fqcname, fqname))
+ if (compareScopedNames(ns->iff->fqcname, fqname) != 0)
continue;
cd->real = ns;
@@ -5672,15 +5639,21 @@ static void finishClass(sipSpec *pt, moduleDef *mod, classDef *cd, optFlags *of)
/* Get the Python name and see if it is different to the C++ name. */
pyname = getPythonName(of, classBaseName(cd));
- cd -> pyname = NULL;
+ cd->pyname = NULL;
checkAttributes(pt, mod, cd->ecd, pyname, FALSE);
- cd->pyname = pyname;
+ cd->pyname = cacheName(pt, pyname);
+
+ if ((flg = findOptFlag(of, "Metatype", dotted_name_flag)) != NULL)
+ cd->metatype = cacheName(pt, flg->fvalue.sval);
+
+ if ((flg = findOptFlag(of, "Supertype", dotted_name_flag)) != NULL)
+ cd->supertype = cacheName(pt, flg->fvalue.sval);
- if ((flg = findOptFlag(of, "TypeFlags", integer_flag)) != NULL)
- cd->userflags = flg->fvalue.ival;
+ if ((flg = findOptFlag(of, "PyQt4Flags", integer_flag)) != NULL)
+ cd->pyqt4_flags = flg->fvalue.ival;
- if (findOptFlag(of, "NoQMetaObject", bool_flag) != NULL)
- setNoQMetaObject(cd);
+ if (findOptFlag(of, "PyQt4NoQMetaObject", bool_flag) != NULL)
+ setPyQt4NoQMetaObject(cd);
if (isOpaque(cd))
{
@@ -5825,7 +5798,7 @@ static void finishClass(sipSpec *pt, moduleDef *mod, classDef *cd, optFlags *of)
if (inMainModule())
{
setIsUsedName(cd->iff->name);
- setIsClassName(cd->iff->name);
+ setIsUsedName(cd->pyname);
}
}
@@ -5860,9 +5833,6 @@ static mappedTypeDef *newMappedType(sipSpec *pt, argDef *ad, optFlags *of)
iff = findIfaceFile(pt, currentModule, snd, mappedtype_iface, ad);
- if (inMainModule())
- setIsUsedName(iff->name);
-
/* Check it hasn't already been defined. */
for (mtd = pt->mappedtypes; mtd != NULL; mtd = mtd->next)
if (mtd->iff == iff)
@@ -5879,7 +5849,7 @@ static mappedTypeDef *newMappedType(sipSpec *pt, argDef *ad, optFlags *of)
iff->module = currentModule;
/* Create a new mapped type. */
- mtd = allocMappedType(ad);
+ mtd = allocMappedType(pt, ad);
if (findOptFlag(of, "NoRelease", bool_flag) != NULL)
setNoRelease(mtd);
@@ -5889,6 +5859,9 @@ static mappedTypeDef *newMappedType(sipSpec *pt, argDef *ad, optFlags *of)
pt->mappedtypes = mtd;
+ if (inMainModule())
+ setIsUsedName(mtd->cname);
+
return mtd;
}
@@ -5896,22 +5869,18 @@ static mappedTypeDef *newMappedType(sipSpec *pt, argDef *ad, optFlags *of)
/*
* Allocate, intialise and return a mapped type structure.
*/
-mappedTypeDef *allocMappedType(argDef *type)
+mappedTypeDef *allocMappedType(sipSpec *pt, argDef *type)
{
mappedTypeDef *mtd;
mtd = sipMalloc(sizeof (mappedTypeDef));
- mtd->mtflags = 0;
mtd->type = *type;
mtd->type.argflags = 0;
mtd->type.nrderefs = 0;
+ mtd->cname = cacheName(pt, type2string(&mtd->type));
mtd->mappednr = -1;
- mtd->iff = NULL;
- mtd->convfromcode = NULL;
- mtd->convtocode = NULL;
- mtd->next = NULL;
return mtd;
}
@@ -5920,8 +5889,8 @@ mappedTypeDef *allocMappedType(argDef *type)
/*
* Create a new enum.
*/
-static enumDef *newEnum(sipSpec *pt,moduleDef *mod,char *name,optFlags *of,
- int flags)
+static enumDef *newEnum(sipSpec *pt, moduleDef *mod, char *name, optFlags *of,
+ int flags)
{
enumDef *ed;
classDef *escope = currentScope();
@@ -5930,15 +5899,23 @@ static enumDef *newEnum(sipSpec *pt,moduleDef *mod,char *name,optFlags *of,
if (name != NULL)
{
- ed->fqcname = text2scopedName(escope, name);
ed->pyname = cacheName(pt, getPythonName(of, name));
-
checkAttributes(pt, mod, escope, ed->pyname->text, FALSE);
+
+ ed->fqcname = text2scopedName(escope, name);
+ ed->cname = cacheName(pt, scopedNameToString(ed->fqcname));
+
+ if (inMainModule())
+ {
+ setIsUsedName(ed->pyname);
+ setIsUsedName(ed->cname);
+ }
}
else
{
- ed->fqcname = NULL;
ed->pyname = NULL;
+ ed->fqcname = NULL;
+ ed->cname = NULL;
}
ed -> enumflags = flags;
@@ -5970,7 +5947,8 @@ void appendTypeStrings(scopedNameDef *ename, signatureDef *patt, signatureDef *s
if (pad->atype == defined_type)
{
- char *nam = NULL;
+ char *nam = NULL, *val;
+ argDef *sad;
/*
* If the type names are already known then check that this is one
@@ -6002,8 +5980,18 @@ void appendTypeStrings(scopedNameDef *ename, signatureDef *patt, signatureDef *s
/* Add the name. */
appendScopedName(names, text2scopePart(nam));
- /* Add the corresponding value. */
- appendScopedName(values, text2scopePart(getType(ename, &src->args[a])));
+ /*
+ * Add the corresponding value. For defined types we don't want
+ * any indirection or references.
+ */
+ sad = &src->args[a];
+
+ if (sad->atype == defined_type)
+ val = scopedNameToString(sad->u.snd);
+ else
+ val = type2string(sad);
+
+ appendScopedName(values, text2scopePart(val));
}
else if (pad->atype == template_type)
{
@@ -6018,72 +6006,141 @@ void appendTypeStrings(scopedNameDef *ename, signatureDef *patt, signatureDef *s
/*
- * Convert a type to a string. We impose some limitations because I'm too lazy
- * to handle everything that might be needed one day.
+ * Convert a type to a string on the heap. The string will use the minimum
+ * whitespace while still remaining valid C++.
*/
-static char *getType(scopedNameDef *ename, argDef *ad)
+static char *type2string(argDef *ad)
{
- if (ad->atype == defined_type)
- return scopedNameToString(ad->u.snd);
+ int i, on_heap = FALSE;
+ int nr_derefs = ad->nrderefs;
+ int is_reference = isReference(ad);
+ char *s;
+
+ /* Use the original type if possible. */
+ if (ad->original_type != NULL && !noTypeName(ad->original_type))
+ {
+ s = scopedNameToString(ad->original_type->fqname);
+ on_heap = TRUE;
- /* For the moment only handle non-pointer, non-reference base types. */
- if (ad->nrderefs == 0 && !isReference(ad))
+ nr_derefs -= ad->original_type->type.nrderefs;
+
+ if (isReference(&ad->original_type->type))
+ is_reference = FALSE;
+ }
+ else
switch (ad->atype)
{
+ case template_type:
+ {
+ templateDef *td = ad->u.td;
+
+ s = scopedNameToString(td->fqname);
+ append(&s, "<");
+
+ for (i = 0; i < td->types.nrArgs; ++i)
+ {
+ char *sub_type = type2string(&td->types.args[i]);
+
+ if (i > 0)
+ append(&s, ",");
+
+ append(&s, sub_type);
+ free(sub_type);
+ }
+
+ if (s[strlen(s) - 1] == '>')
+ append(&s, " >");
+ else
+ append(&s, ">");
+
+ on_heap = TRUE;
+ break;
+ }
+
+ case defined_type:
+ s = scopedNameToString(ad->u.snd);
+ on_heap = TRUE;
+ break;
+
case ustring_type:
- return "unsigned char";
+ s = "unsigned char";
+ break;
case string_type:
- return "char";
+ s = "char";
+ break;
case sstring_type:
- return "signed char";
+ s = "signed char";
+ break;
case wstring_type:
- return "wchar_t";
+ s = "wchar_t";
+ break;
case ushort_type:
- return "unsigned short";
+ s = "unsigned short";
+ break;
case short_type:
- return "short";
+ s = "short";
+ break;
case uint_type:
- return "unsigned int";
+ s = "unsigned int";
+ break;
case int_type:
case cint_type:
- return "int";
+ s = "int";
+ break;
case ulong_type:
- return "unsigned long";
+ s = "unsigned long";
+ break;
case long_type:
- return "long";
+ s = "long";
+ break;
case ulonglong_type:
- return "unsigned long long";
+ s = "unsigned long long";
+ break;
case longlong_type:
- return "long long";
+ s = "long long";
+ break;
case float_type:
case cfloat_type:
- return "float";
+ s = "float";
+ break;
case double_type:
case cdouble_type:
- return "double";
+ s = "double";
+ break;
case bool_type:
case cbool_type:
- return "bool";
+ s = "bool";
+ break;
+
+ default:
+ fatal("Unsupported type argument to type2string()\n");
}
- fatalScopedName(ename);
- fatal(": unsupported type argument to template class instantiation\n");
+ /* Make sure the string is on the heap. */
+ if (!on_heap)
+ s = sipStrdup(s);
- return NULL;
+ while (nr_derefs-- > 0)
+ append(&s, "*");
+
+ if (is_reference)
+ append(&s, "&");
+
+ return s;
}
@@ -6162,7 +6219,7 @@ static void instantiateClassTemplate(sipSpec *pt, moduleDef *mod,
*cd = *tcd->cd;
resetIsTemplateClass(cd);
- cd->pyname = scopedNameTail(fqname);
+ cd->pyname = cacheName(pt, scopedNameTail(fqname));
cd->td = td;
/* Handle the interface file. */
@@ -6182,7 +6239,7 @@ static void instantiateClassTemplate(sipSpec *pt, moduleDef *mod,
if (inMainModule())
{
setIsUsedName(cd->iff->name);
- setIsClassName(cd->iff->name);
+ setIsUsedName(cd->pyname);
}
cd->ecd = currentScope();
@@ -6394,10 +6451,19 @@ static void instantiateTemplateEnums(sipSpec *pt, classTmplDef *tcd,
*ed = *ted;
if (ed->fqcname != NULL)
+ {
ed->fqcname = text2scopedName(cd, scopedNameTail(ed->fqcname));
+ ed->cname = cacheName(pt, scopedNameToString(ed->fqcname));
+ }
+
+ if (inMainModule())
+ {
+ if (ed->pyname != NULL)
+ setIsUsedName(ed->pyname);
- if (ed->pyname != NULL && inMainModule())
- setIsUsedName(ed->pyname);
+ if (ed->cname != NULL)
+ setIsUsedName(ed->cname);
+ }
ed->ecd = cd;
ed->module = mod;
@@ -6460,8 +6526,7 @@ static void instantiateTemplateVars(sipSpec *pt, classTmplDef *tcd,
vd->getcode = templateCode(pt, used, vd->getcode, type_names, type_values);
vd->setcode = templateCode(pt, used, vd->setcode, type_names, type_values);
- vd->next = pt->vars;
- pt->vars = vd;
+ addVariable(pt, vd);
}
}
@@ -6605,10 +6670,7 @@ codeBlock *templateCode(sipSpec *pt, ifaceFileList **used, codeBlock *ocb,
else
{
static char *gen_names[] = {
- "sipForceConvertToTransfer_",
- "sipForceConvertTo_",
- "sipConvertFromTransfer_",
- "sipConvertFrom_",
+ "sipType_",
"sipClass_",
"sipEnum_",
"sipException_",
@@ -6759,7 +6821,7 @@ static int foundInScope(scopedNameDef *fq_name, scopedNameDef *rel_name)
snd = copyScopedName(classFQCName(scope));
appendScopedName(&snd, copyScopedName(rel_name));
- found = sameScopedName(fq_name, snd);
+ found = (compareScopedNames(fq_name, snd) == 0);
freeScopedName(snd);
@@ -6767,7 +6829,7 @@ static int foundInScope(scopedNameDef *fq_name, scopedNameDef *rel_name)
return TRUE;
}
- return sameScopedName(fq_name, rel_name);
+ return compareScopedNames(fq_name, rel_name) == 0;
}
@@ -6777,7 +6839,7 @@ static int foundInScope(scopedNameDef *fq_name, scopedNameDef *rel_name)
static void newTypedef(sipSpec *pt, moduleDef *mod, char *name, argDef *type,
optFlags *optflgs)
{
- typedefDef *td;
+ typedefDef *td, **tdp;
scopedNameDef *fqname;
classDef *scope;
@@ -6801,14 +6863,24 @@ static void newTypedef(sipSpec *pt, moduleDef *mod, char *name, argDef *type,
}
}
- /* Check it doesn't already exist. */
- for (td = pt->typedefs; td != NULL; td = td->next)
- if (sameScopedName(td->fqname, fqname))
+ /*
+ * Check it doesn't already exist and find the position in the sorted list
+ * where it should be put.
+ */
+ for (tdp = &pt->typedefs; *tdp != NULL; tdp = &(*tdp)->next)
+ {
+ int res = compareScopedNames((*tdp)->fqname, fqname);
+
+ if (res == 0)
{
fatalScopedName(fqname);
fatal(" already defined\n");
}
+ if (res > 0)
+ break;
+ }
+
td = sipMalloc(sizeof (typedefDef));
td->tdflags = 0;
@@ -6816,14 +6888,14 @@ static void newTypedef(sipSpec *pt, moduleDef *mod, char *name, argDef *type,
td->ecd = scope;
td->module = mod;
td->type = *type;
- td->next = pt->typedefs;
+
+ td->next = *tdp;
+ *tdp = td;
if (findOptFlag(optflgs, "NoTypeName", bool_flag) != NULL)
setNoTypeName(td);
mod->nrtypedefs++;
-
- pt->typedefs = td;
}
@@ -6924,12 +6996,11 @@ static void newVar(sipSpec *pt,moduleDef *mod,char *name,int isstatic,
var -> accessfunc = acode;
var -> getcode = gcode;
var -> setcode = scode;
- var -> next = pt -> vars;
if (isstatic || (escope != NULL && escope->iff->type == namespace_iface))
setIsStaticVar(var);
- pt -> vars = var;
+ addVariable(pt, var);
}
@@ -7016,7 +7087,6 @@ static void newFunction(sipSpec *pt,moduleDef *mod,int sflags,int isstatic,
signatureDef *cppsig)
{
classDef *cd = currentScope();
- nameDef *pname;
int factory, xferback, no_arg_parser;
overDef *od, **odp, **headp;
optFlag *of;
@@ -7133,7 +7203,7 @@ static void newFunction(sipSpec *pt,moduleDef *mod,int sflags,int isstatic,
if (isvirt)
{
- if (isSignal(od) && !optNoEmitters(pt))
+ if (isSignal(od) && pluginPyQt3(pt))
yyerror("Virtual signals aren't supported");
setIsVirtual(od);
@@ -7252,26 +7322,32 @@ static const char *getPythonName(optFlags *optflgs, const char *cname)
/*
- * Cache a name in a module.
+ * Cache a name in a module. Entries in the cache are stored in order of
+ * decreasing length.
*/
nameDef *cacheName(sipSpec *pt, const char *name)
{
- nameDef *nd;
+ nameDef *nd, **ndp = &pt->namecache;
+ size_t len = strlen(name);
- /* See if it already exists. */
- for (nd = pt->namecache; nd != NULL; nd = nd->next)
- if (strcmp(nd->text, name) == 0)
+ /* Skip entries that are too large. */
+ while (*ndp != NULL && (*ndp)->len > len)
+ ndp = &(*ndp)->next;
+
+ /* Check entries that are the right length. */
+ for (nd = *ndp; nd != NULL && nd->len == len; nd = nd->next)
+ if (memcmp(nd->text, name, len) == 0)
return nd;
/* Create a new one. */
nd = sipMalloc(sizeof (nameDef));
nd->nameflags = 0;
- nd->module = currentSpec->module;
nd->text = name;
- nd->next = pt->namecache;
+ nd->len = len;
+ nd->next = *ndp;
- pt->namecache = nd;
+ *ndp = nd;
return nd;
}
@@ -7284,7 +7360,7 @@ static memberDef *findFunction(sipSpec *pt, moduleDef *mod, classDef *cd,
const char *pname, int hwcode, int nrargs, int no_arg_parser)
{
static struct slot_map {
- char *name; /* The slot name. */
+ const char *name; /* The slot name. */
slotType type; /* The corresponding type. */
int needs_hwcode; /* Set if handwritten code is required. */
int nrargs; /* Nr. of arguments. */
@@ -7351,6 +7427,7 @@ static memberDef *findFunction(sipSpec *pt, moduleDef *mod, classDef *cd,
yyerror("This Python slot requires %MethodCode");
if (sm->nrargs >= 0)
+ {
if (cd == NULL)
{
/* Global operators need one extra argument. */
@@ -7359,6 +7436,7 @@ static memberDef *findFunction(sipSpec *pt, moduleDef *mod, classDef *cd,
}
else if (sm->nrargs != nrargs)
yyerror("Incorrect number of arguments to Python slot");
+ }
st = sm->type;
@@ -7522,7 +7600,7 @@ static void checkAttributes(sipSpec *pt, moduleDef *mod, classDef *pyscope,
if (cd -> ecd != pyscope || cd -> pyname == NULL)
continue;
- if (strcmp(cd->pyname, attr) == 0 && !isExternal(cd))
+ if (strcmp(cd->pyname->text, attr) == 0 && !isExternal(cd))
yyerror("There is already a class or namespace in scope with the same Python name");
}
@@ -8007,52 +8085,36 @@ static int getDeprecated(optFlags *optflgs)
/*
- * Return TRUE if the QtNoEmitters option was specified.
- */
-int optNoEmitters(sipSpec *pt)
-{
- return optFind(pt, "QtNoEmitters");
-}
-
-
-/*
- * Return TRUE if the QtRegisterTypes option was specified.
- */
-int optRegisterTypes(sipSpec *pt)
-{
- return optFind(pt, "QtRegisterTypes");
-}
-
-
-/*
- * Return TRUE if the Qt4Q_OBJECT option was specified.
+ * Return TRUE if the PyQt3 plugin was specified.
*/
-int optQ_OBJECT4(sipSpec *pt)
+int pluginPyQt3(sipSpec *pt)
{
- return optFind(pt, "Qt4Q_OBJECT");
+ return stringFind(pt->plugins, "PyQt3");
}
/*
- * Return TRUE if the AssignmentHelpers option was specified.
+ * Return TRUE if the PyQt4 plugin was specified.
*/
-int optAssignmentHelpers(sipSpec *pt)
+int pluginPyQt4(sipSpec *pt)
{
- return optFind(pt, "AssignmentHelpers");
+ return stringFind(pt->plugins, "PyQt4");
}
/*
- * Return TRUE if a particular option was specified with %SIPOptions.
+ * Return TRUE if a list of strings contains a given entry.
*/
-static int optFind(sipSpec *pt, const char *opt)
+static int stringFind(stringList *sl, const char *s)
{
- stringList *sl;
-
- for (sl = pt->options; sl != NULL; sl = sl->next)
- if (strcmp(sl->s, opt) == 0)
+ while (sl != NULL)
+ {
+ if (strcmp(sl->s, s) == 0)
return TRUE;
+ sl = sl->next;
+ }
+
return FALSE;
}
@@ -8060,9 +8122,12 @@ static int optFind(sipSpec *pt, const char *opt)
/*
* Set the name of a module.
*/
-static void setModuleName(moduleDef *mod, const char *fullname)
+static void setModuleName(sipSpec *pt, moduleDef *mod, const char *fullname)
{
- mod->fullname = fullname;
+ mod->fullname = cacheName(pt, fullname);
+
+ if (inMainModule())
+ setIsUsedName(mod->fullname);
if ((mod->name = strrchr(fullname, '.')) != NULL)
mod->name++;
@@ -8112,3 +8177,23 @@ static classDef *completeClass(scopedNameDef *snd, optFlags *of, int has_def)
return cd;
}
+
+/*
+ * Add a variable to the list so that the list remains sorted.
+ */
+static void addVariable(sipSpec *pt, varDef *vd)
+{
+ varDef **at = &pt->vars;
+
+ while (*at != NULL)
+ {
+ if (strcmp(vd->pyname->text, (*at)->pyname->text) < 0)
+ break;
+
+ at = &(*at)->next;
+ }
+
+ vd->next = *at;
+ *at = vd;
+}
+
sipgen/parser.c
@@ -29,15 +29,15 @@
/* Put the tokens into the symbol table, so that GDB and other debuggers
know about them. */
enum yytokentype {
- TK_OPTIONS = 258,
- TK_NOEMITTERS = 259,
- TK_DOC = 260,
- TK_EXPORTEDDOC = 261,
- TK_MAKEFILE = 262,
- TK_ACCESSCODE = 263,
- TK_GETCODE = 264,
- TK_SETCODE = 265,
- TK_PREINITCODE = 266,
+ TK_PLUGIN = 258,
+ TK_DOC = 259,
+ TK_EXPORTEDDOC = 260,
+ TK_MAKEFILE = 261,
+ TK_ACCESSCODE = 262,
+ TK_GETCODE = 263,
+ TK_SETCODE = 264,
+ TK_PREINITCODE = 265,
+ TK_INITCODE = 266,
TK_POSTINITCODE = 267,
TK_UNITCODE = 268,
TK_MODCODE = 269,
@@ -130,18 +130,20 @@
TK_RAISECODE = 356,
TK_EXPLICIT = 357,
TK_TEMPLATE = 358,
- TK_ELLIPSIS = 359
+ TK_ELLIPSIS = 359,
+ TK_DEFMETATYPE = 360,
+ TK_DEFSUPERTYPE = 361
};
#endif
-#define TK_OPTIONS 258
-#define TK_NOEMITTERS 259
-#define TK_DOC 260
-#define TK_EXPORTEDDOC 261
-#define TK_MAKEFILE 262
-#define TK_ACCESSCODE 263
-#define TK_GETCODE 264
-#define TK_SETCODE 265
-#define TK_PREINITCODE 266
+#define TK_PLUGIN 258
+#define TK_DOC 259
+#define TK_EXPORTEDDOC 260
+#define TK_MAKEFILE 261
+#define TK_ACCESSCODE 262
+#define TK_GETCODE 263
+#define TK_SETCODE 264
+#define TK_PREINITCODE 265
+#define TK_INITCODE 266
#define TK_POSTINITCODE 267
#define TK_UNITCODE 268
#define TK_MODCODE 269
@@ -235,12 +237,14 @@
#define TK_EXPLICIT 357
#define TK_TEMPLATE 358
#define TK_ELLIPSIS 359
+#define TK_DEFMETATYPE 360
+#define TK_DEFSUPERTYPE 361
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 120 "parser.y"
+#line 121 "parser.y"
typedef union YYSTYPE {
char qchar;
char *text;
@@ -262,7 +266,7 @@ typedef union YYSTYPE {
classDef *klass;
} YYSTYPE;
/* Line 1241 of yacc.c. */
-#line 266 "parser.h"
+#line 270 "parser.h"
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
sipgen/parser.h
@@ -1,7 +1,7 @@
/*
* The SIP parser.
*
- * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
+ * Copyright (c) 2009 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -94,12 +94,12 @@ static int getDeprecated(optFlags *);
static void templateSignature(signatureDef *sd, int result, classTmplDef *tcd, templateDef *td, classDef *ncd);
static void templateType(argDef *ad, classTmplDef *tcd, templateDef *td, classDef *ncd);
static int search_back(const char *end, const char *start, const char *target);
-static char *getType(scopedNameDef *ename, argDef *ad);
+static char *type2string(argDef *ad);
static char *scopedNameToString(scopedNameDef *name);
static void addUsedFromCode(sipSpec *pt, ifaceFileList **used, const char *sname);
static int sameName(scopedNameDef *snd, const char *sname);
-static int optFind(sipSpec *pt, const char *opt);
-static void setModuleName(moduleDef *mod, const char *fullname);
+static int stringFind(stringList *sl, const char *s);
+static void setModuleName(sipSpec *pt, moduleDef *mod, const char *fullname);
static int foundInScope(scopedNameDef *fq_name, scopedNameDef *rel_name);
static void defineClass(scopedNameDef *snd);
static classDef *completeClass(scopedNameDef *snd, optFlags *of, int has_def);
@@ -115,6 +115,7 @@ static overDef *instantiateTemplateOverloads(sipSpec *pt, overDef *tod,
templateDef *td, classDef *cd, ifaceFileList **used,
scopedNameDef *type_names, scopedNameDef *type_values);
static void resolveAnyTypedef(sipSpec *pt, argDef *ad);
+static void addVariable(sipSpec *pt, varDef *vd);
%}
%union {
@@ -138,8 +139,7 @@ static void resolveAnyTypedef(sipSpec *pt, argDef *ad);
classDef *klass;
}
-%token TK_OPTIONS
-%token TK_NOEMITTERS
+%token TK_PLUGIN
%token TK_DOC
%token TK_EXPORTEDDOC
%token TK_MAKEFILE
@@ -147,6 +147,7 @@ static void resolveAnyTypedef(sipSpec *pt, argDef *ad);
%token TK_GETCODE
%token TK_SETCODE
%token TK_PREINITCODE
+%token TK_INITCODE
%token TK_POSTINITCODE
%token TK_UNITCODE
%token TK_MODCODE
@@ -240,6 +241,8 @@ static void resolveAnyTypedef(sipSpec *pt, argDef *ad);
%token TK_EXPLICIT
%token TK_TEMPLATE
%token TK_ELLIPSIS
+%token TK_DEFMETATYPE
+%token TK_DEFSUPERTYPE
%type <memArg> argvalue
%type <memArg> argtype
@@ -288,7 +291,7 @@ static void resolveAnyTypedef(sipSpec *pt, argDef *ad);
%type <text> operatorname
%type <text> optfilename
%type <text> optname
-%type <text> modname
+%type <text> dottedname
%type <optflags> optflags
%type <optflags> flaglist
%type <flag> flag
@@ -333,8 +336,7 @@ statement: {
modstatement: module
| consmodule
| compmodule
- | options
- | noemitters
+ | plugin
| copying
| include
| optinclude
@@ -343,6 +345,8 @@ modstatement: module
| platforms
| feature
| license
+ | defmetatype
+ | defsupertype
| exphdrcode {
if (notSkipping())
appendCodeBlock(¤tSpec->exphdrcode, $1);
@@ -356,6 +360,7 @@ modstatement: module
appendCodeBlock(¤tModule->cppcode, $1);
}
| preinitcode
+ | initcode
| postinitcode
| unitcode
| prepycode
@@ -391,23 +396,8 @@ nsstatement: ifstart
}
;
-options: TK_OPTIONS '(' optionlist ')'
- ;
-
-optionlist: TK_NAME {
- appendString(¤tSpec->options, $1);
- }
- | optionlist ',' TK_NAME {
- appendString(¤tSpec->options, $3);
- }
- ;
-
-noemitters: TK_NOEMITTERS {
- if (notSkipping())
- {
- yywarning("%SIPNoEmitters is deprecated, please use %SIPOptions instead");
- appendString(¤tSpec->options, "QtNoEmitters");
- }
+plugin: TK_PLUGIN TK_NAME {
+ appendString(¤tSpec->plugins, $2);
}
;
@@ -458,7 +448,7 @@ baseexception: {
/* See if it is a defined exception. */
for (xd = currentSpec->exceptions; xd != NULL; xd = xd->next)
- if (sameScopedName(xd->iff->fqcname, $2))
+ if (compareScopedNames(xd->iff->fqcname, $2) == 0)
{
$$.base = xd;
break;
@@ -560,7 +550,7 @@ mappedtypetmpl: template TK_MAPPEDTYPE basetype {
/* Check a template hasn't already been provided. */
for (mtt = currentSpec->mappedtypetemplates; mtt != NULL; mtt = mtt->next)
- if (sameScopedName(mtt->mt->type.u.td->fqname, $3.u.td->fqname) && sameTemplateSignature(&mtt->mt->type.u.td->types, &$3.u.td->types, TRUE))
+ if (compareScopedNames(mtt->mt->type.u.td->fqname, $3.u.td->fqname) == 0 && sameTemplateSignature(&mtt->mt->type.u.td->types, &$3.u.td->types, TRUE))
yyerror("%MappedType template for this type has already been defined");
$3.nrderefs = 0;
@@ -569,7 +559,7 @@ mappedtypetmpl: template TK_MAPPEDTYPE basetype {
mtt = sipMalloc(sizeof (mappedTypeTmplDef));
mtt->sig = $1;
- mtt->mt = allocMappedType(&$3);
+ mtt->mt = allocMappedType(currentSpec, &$3);
mtt->next = currentSpec->mappedtypetemplates;
currentSpec->mappedtypetemplates = mtt;
@@ -648,17 +638,8 @@ namespace: TK_NAMESPACE TK_NAME {
{
classDef *ns = currentScope();
- if (!isUsedName(ns->iff->name))
- {
- varDef *vd;
-
- for (vd = currentSpec->vars; vd != NULL; vd = vd->next)
- if (vd->ecd == ns)
- {
- setIsUsedName(ns->iff->name);
- break;
- }
- }
+ setIsUsedName(ns->iff->name);
+ setIsUsedName(ns->pyname);
}
popScope();
@@ -811,7 +792,29 @@ license: TK_LICENSE optflags {
}
;
-consmodule: TK_CONSMODULE modname {
+defmetatype:TK_DEFMETATYPE dottedname {
+ if (notSkipping())
+ {
+ if (currentModule->defmetatype != NULL)
+ yyerror("%DefaultMetatype has already been defined for this module");
+
+ currentModule->defmetatype = cacheName(currentSpec, $2);
+ }
+ }
+ ;
+
+defsupertype: TK_DEFSUPERTYPE dottedname {
+ if (notSkipping())
+ {
+ if (currentModule->defsupertype != NULL)
+ yyerror("%DefaultSupertype has already been defined for this module");
+
+ currentModule->defsupertype = cacheName(currentSpec, $2);
+ }
+ }
+ ;
+
+consmodule: TK_CONSMODULE dottedname {
/* Make sure this is the first mention of a module. */
if (currentSpec->module != currentModule)
yyerror("A %ConsolidatedModule cannot be %Imported");
@@ -819,12 +822,12 @@ consmodule: TK_CONSMODULE modname {
if (currentModule->fullname != NULL)
yyerror("%ConsolidatedModule must appear before any %Module or %CModule directive");
- setModuleName(currentModule, $2);
+ setModuleName(currentSpec, currentModule, $2);
setIsConsolidated(currentModule);
}
;
-compmodule: TK_COMPOMODULE modname {
+compmodule: TK_COMPOMODULE dottedname {
/* Make sure this is the first mention of a module. */
if (currentSpec->module != currentModule)
yyerror("A %CompositeModule cannot be %Imported");
@@ -832,18 +835,18 @@ compmodule: TK_COMPOMODULE modname {
if (currentModule->fullname != NULL)
yyerror("%CompositeModule must appear before any %Module or %CModule directive");
- setModuleName(currentModule, $2);
+ setModuleName(currentSpec, currentModule, $2);
setIsComposite(currentModule);
}
;
-module: modlang modname optnumber {
+module: modlang dottedname optnumber {
/* Check the module hasn't already been defined. */
moduleDef *mod;
for (mod = currentSpec->modules; mod != NULL; mod = mod->next)
- if (mod->fullname != NULL && strcmp(mod->fullname, $2) == 0)
+ if (mod->fullname != NULL && strcmp(mod->fullname->text, $2) == 0)
yyerror("Module is already defined");
/*
@@ -860,7 +863,7 @@ module: modlang modname optnumber {
currentModule = mod;
}
- setModuleName(currentModule, $2);
+ setModuleName(currentSpec, currentModule, $2);
currentModule->version = $3;
if (currentSpec->genc < 0)
@@ -878,18 +881,18 @@ modlang: TK_MODULE {
}
;
-modname: TK_NAME
+dottedname: TK_NAME
| TK_PATHNAME {
/*
- * The grammar design is a bit broken and this is the
- * easiest way to allow periods in module names.
+ * The grammar design is a bit broken and this is the easiest way
+ * to allow periods in names.
*/
char *cp;
for (cp = $1; *cp != '\0'; ++cp)
if (*cp != '.' && *cp != '_' && !isalnum(*cp))
- yyerror("Invalid character in module name");
+ yyerror("Invalid character in name");
$$ = $1;
}
@@ -1017,6 +1020,12 @@ preinitcode: TK_PREINITCODE codeblock {
}
;
+initcode: TK_INITCODE codeblock {
+ if (notSkipping())
+ appendCodeBlock(¤tModule->initcode, $2);
+ }
+ ;
+
postinitcode: TK_POSTINITCODE codeblock {
if (notSkipping())
appendCodeBlock(¤tModule->postinitcode, $2);
@@ -1835,7 +1844,7 @@ function: cpptype TK_NAME '(' arglist ')' optconst optexceptions optabstract o
/* Check it doesn't already exist. */
for (al = scope->casts; al != NULL; al = al->next)
- if (sameScopedName($2.u.snd, al->arg.u.snd))
+ if (compareScopedNames($2.u.snd, al->arg.u.snd) == 0)
yyerror("This operator cast has already been specified in this class");
al = sipMalloc(sizeof (argList));
@@ -1936,8 +1945,8 @@ flag: TK_NAME {
}
;
-flagvalue: TK_NAME {
- $$.ftype = name_flag;
+flagvalue: dottedname {
+ $$.ftype = (strchr($1, '.') != NULL) ? dotted_name_flag : name_flag;
$$.fvalue.sval = $1;
}
| TK_STRING {
@@ -2572,22 +2581,22 @@ void parse(sipSpec *spec, FILE *fp, char *filename, stringList *tsl,
/* Initialise the spec. */
- spec -> modules = NULL;
- spec -> namecache = NULL;
- spec -> ifacefiles = NULL;
- spec -> classes = NULL;
- spec -> classtemplates = NULL;
- spec -> exceptions = NULL;
- spec -> mappedtypes = NULL;
- spec -> mappedtypetemplates = NULL;
- spec -> enums = NULL;
- spec -> vars = NULL;
- spec -> typedefs = NULL;
- spec -> exphdrcode = NULL;
- spec -> docs = NULL;
- spec -> sigslots = FALSE;
- spec -> genc = -1;
- spec -> options = NULL;
+ spec->modules = NULL;
+ spec->namecache = NULL;
+ spec->ifacefiles = NULL;
+ spec->classes = NULL;
+ spec->classtemplates = NULL;
+ spec->exceptions = NULL;
+ spec->mappedtypes = NULL;
+ spec->mappedtypetemplates = NULL;
+ spec->enums = NULL;
+ spec->vars = NULL;
+ spec->typedefs = NULL;
+ spec->exphdrcode = NULL;
+ spec->docs = NULL;
+ spec->sigslots = FALSE;
+ spec->genc = -1;
+ spec->plugins = NULL;
currentSpec = spec;
neededQualifiers = tsl;
@@ -2604,7 +2613,7 @@ void parse(sipSpec *spec, FILE *fp, char *filename, stringList *tsl,
sectionFlags = 0;
newModule(fp, filename);
- spec -> module = currentModule;
+ spec->module = currentModule;
yyparse();
@@ -2695,38 +2704,10 @@ static moduleDef *allocModule()
moduleDef *newmod, **tailp;
newmod = sipMalloc(sizeof (moduleDef));
- newmod->fullname = NULL;
- newmod->name = NULL;
+
newmod->version = -1;
- newmod->modflags = 0;
newmod->qobjclass = -1;
- newmod->othfuncs = NULL;
- newmod->overs = NULL;
- newmod->hdrcode = NULL;
- newmod->cppcode = NULL;
- newmod->copying = NULL;
- newmod->preinitcode = NULL;
- newmod->postinitcode = NULL;
- newmod->unitcode = NULL;
- newmod->file = NULL;
- newmod->qualifiers = NULL;
- newmod->root.cd = NULL;
- newmod->root.child = NULL;
- newmod->nrtimelines = 0;
- newmod->nrclasses = 0;
- newmod->nrexceptions = 0;
- newmod->nrmappedtypes = 0;
- newmod->nrenums = 0;
- newmod->nrtypedefs = 0;
newmod->nrvirthandlers = -1;
- newmod->virthandlers = NULL;
- newmod->license = NULL;
- newmod->proxies = NULL;
- newmod->container = NULL;
- newmod->used = NULL;
- newmod->allimports = NULL;
- newmod->imports = NULL;
- newmod->next = NULL;
/*
* The consolidated module support needs these to be in order that they
@@ -2769,7 +2750,7 @@ ifaceFileDef *findIfaceFile(sipSpec *pt, moduleDef *mod, scopedNameDef *fqname,
for (iff = pt->ifacefiles; iff != NULL; iff = iff->next)
{
- if (!sameScopedName(iff->fqcname, fqname))
+ if (compareScopedNames(iff->fqcname, fqname) != 0)
continue;
/*
@@ -2832,7 +2813,7 @@ ifaceFileDef *findIfaceFile(sipSpec *pt, moduleDef *mod, scopedNameDef *fqname,
iff = sipMalloc(sizeof (ifaceFileDef));
- iff->name = cacheName(pt, scopedNameTail(fqname));
+ iff->name = cacheName(pt, scopedNameToString(fqname));
iff->type = iftype;
iff->fqcname = fqname;
iff->module = NULL;
@@ -2871,37 +2852,8 @@ static classDef *findClassWithInterface(sipSpec *pt, ifaceFileDef *iff)
cd = sipMalloc(sizeof (classDef));
cd -> iff = iff;
- cd -> pyname = classBaseName(cd);
+ cd -> pyname = cacheName(pt, classBaseName(cd));
cd -> classnr = -1;
- cd -> classflags = 0;
- cd -> userflags = 0;
- cd -> ecd = NULL;
- cd -> dtorexceptions = NULL;
- cd -> real = NULL;
- cd -> node = NULL;
- cd -> supers = NULL;
- cd -> mro = NULL;
- cd -> td = NULL;
- cd -> ctors = NULL;
- cd -> defctor = NULL;
- cd -> dealloccode = NULL;
- cd -> dtorcode = NULL;
- cd -> members = NULL;
- cd -> overs = NULL;
- cd -> casts = NULL;
- cd -> vmembers = NULL;
- cd -> visible = NULL;
- cd -> cppcode = NULL;
- cd -> convtosubcode = NULL;
- cd -> subbase = NULL;
- cd -> convtocode = NULL;
- cd -> travcode = NULL;
- cd -> clearcode = NULL;
- cd -> readbufcode = NULL;
- cd -> writebufcode = NULL;
- cd -> segcountcode = NULL;
- cd -> charbufcode = NULL;
- cd -> picklecode = NULL;
cd -> next = pt -> classes;
pt -> classes = cd;
@@ -3066,7 +3018,7 @@ static classDef *newClass(sipSpec *pt,ifaceFileType iftype,
if (ns->iff->type != namespace_iface)
continue;
- if (!sameScopedName(ns->iff->fqcname, fqname))
+ if (compareScopedNames(ns->iff->fqcname, fqname) != 0)
continue;
cd->real = ns;
@@ -3089,15 +3041,21 @@ static void finishClass(sipSpec *pt, moduleDef *mod, classDef *cd, optFlags *of)
/* Get the Python name and see if it is different to the C++ name. */
pyname = getPythonName(of, classBaseName(cd));
- cd -> pyname = NULL;
+ cd->pyname = NULL;
checkAttributes(pt, mod, cd->ecd, pyname, FALSE);
- cd->pyname = pyname;
+ cd->pyname = cacheName(pt, pyname);
+
+ if ((flg = findOptFlag(of, "Metatype", dotted_name_flag)) != NULL)
+ cd->metatype = cacheName(pt, flg->fvalue.sval);
+
+ if ((flg = findOptFlag(of, "Supertype", dotted_name_flag)) != NULL)
+ cd->supertype = cacheName(pt, flg->fvalue.sval);
- if ((flg = findOptFlag(of, "TypeFlags", integer_flag)) != NULL)
- cd->userflags = flg->fvalue.ival;
+ if ((flg = findOptFlag(of, "PyQt4Flags", integer_flag)) != NULL)
+ cd->pyqt4_flags = flg->fvalue.ival;
- if (findOptFlag(of, "NoQMetaObject", bool_flag) != NULL)
- setNoQMetaObject(cd);
+ if (findOptFlag(of, "PyQt4NoQMetaObject", bool_flag) != NULL)
+ setPyQt4NoQMetaObject(cd);
if (isOpaque(cd))
{
@@ -3242,7 +3200,7 @@ static void finishClass(sipSpec *pt, moduleDef *mod, classDef *cd, optFlags *of)
if (inMainModule())
{
setIsUsedName(cd->iff->name);
- setIsClassName(cd->iff->name);
+ setIsUsedName(cd->pyname);
}
}
@@ -3277,9 +3235,6 @@ static mappedTypeDef *newMappedType(sipSpec *pt, argDef *ad, optFlags *of)
iff = findIfaceFile(pt, currentModule, snd, mappedtype_iface, ad);
- if (inMainModule())
- setIsUsedName(iff->name);
-
/* Check it hasn't already been defined. */
for (mtd = pt->mappedtypes; mtd != NULL; mtd = mtd->next)
if (mtd->iff == iff)
@@ -3296,7 +3251,7 @@ static mappedTypeDef *newMappedType(sipSpec *pt, argDef *ad, optFlags *of)
iff->module = currentModule;
/* Create a new mapped type. */
- mtd = allocMappedType(ad);
+ mtd = allocMappedType(pt, ad);
if (findOptFlag(of, "NoRelease", bool_flag) != NULL)
setNoRelease(mtd);
@@ -3306,6 +3261,9 @@ static mappedTypeDef *newMappedType(sipSpec *pt, argDef *ad, optFlags *of)
pt->mappedtypes = mtd;
+ if (inMainModule())
+ setIsUsedName(mtd->cname);
+
return mtd;
}
@@ -3313,22 +3271,18 @@ static mappedTypeDef *newMappedType(sipSpec *pt, argDef *ad, optFlags *of)
/*
* Allocate, intialise and return a mapped type structure.
*/
-mappedTypeDef *allocMappedType(argDef *type)
+mappedTypeDef *allocMappedType(sipSpec *pt, argDef *type)
{
mappedTypeDef *mtd;
mtd = sipMalloc(sizeof (mappedTypeDef));
- mtd->mtflags = 0;
mtd->type = *type;
mtd->type.argflags = 0;
mtd->type.nrderefs = 0;
+ mtd->cname = cacheName(pt, type2string(&mtd->type));
mtd->mappednr = -1;
- mtd->iff = NULL;
- mtd->convfromcode = NULL;
- mtd->convtocode = NULL;
- mtd->next = NULL;
return mtd;
}
@@ -3337,8 +3291,8 @@ mappedTypeDef *allocMappedType(argDef *type)
/*
* Create a new enum.
*/
-static enumDef *newEnum(sipSpec *pt,moduleDef *mod,char *name,optFlags *of,
- int flags)
+static enumDef *newEnum(sipSpec *pt, moduleDef *mod, char *name, optFlags *of,
+ int flags)
{
enumDef *ed;
classDef *escope = currentScope();
@@ -3347,15 +3301,23 @@ static enumDef *newEnum(sipSpec *pt,moduleDef *mod,char *name,optFlags *of,
if (name != NULL)
{
- ed->fqcname = text2scopedName(escope, name);
ed->pyname = cacheName(pt, getPythonName(of, name));
-
checkAttributes(pt, mod, escope, ed->pyname->text, FALSE);
+
+ ed->fqcname = text2scopedName(escope, name);
+ ed->cname = cacheName(pt, scopedNameToString(ed->fqcname));
+
+ if (inMainModule())
+ {
+ setIsUsedName(ed->pyname);
+ setIsUsedName(ed->cname);
+ }
}
else
{
- ed->fqcname = NULL;
ed->pyname = NULL;
+ ed->fqcname = NULL;
+ ed->cname = NULL;
}
ed -> enumflags = flags;
@@ -3387,7 +3349,8 @@ void appendTypeStrings(scopedNameDef *ename, signatureDef *patt, signatureDef *s
if (pad->atype == defined_type)
{
- char *nam = NULL;
+ char *nam = NULL, *val;
+ argDef *sad;
/*
* If the type names are already known then check that this is one
@@ -3419,8 +3382,18 @@ void appendTypeStrings(scopedNameDef *ename, signatureDef *patt, signatureDef *s
/* Add the name. */
appendScopedName(names, text2scopePart(nam));
- /* Add the corresponding value. */
- appendScopedName(values, text2scopePart(getType(ename, &src->args[a])));
+ /*
+ * Add the corresponding value. For defined types we don't want
+ * any indirection or references.
+ */
+ sad = &src->args[a];
+
+ if (sad->atype == defined_type)
+ val = scopedNameToString(sad->u.snd);
+ else
+ val = type2string(sad);
+
+ appendScopedName(values, text2scopePart(val));
}
else if (pad->atype == template_type)
{
@@ -3435,72 +3408,141 @@ void appendTypeStrings(scopedNameDef *ename, signatureDef *patt, signatureDef *s
/*
- * Convert a type to a string. We impose some limitations because I'm too lazy
- * to handle everything that might be needed one day.
+ * Convert a type to a string on the heap. The string will use the minimum
+ * whitespace while still remaining valid C++.
*/
-static char *getType(scopedNameDef *ename, argDef *ad)
+static char *type2string(argDef *ad)
{
- if (ad->atype == defined_type)
- return scopedNameToString(ad->u.snd);
+ int i, on_heap = FALSE;
+ int nr_derefs = ad->nrderefs;
+ int is_reference = isReference(ad);
+ char *s;
+
+ /* Use the original type if possible. */
+ if (ad->original_type != NULL && !noTypeName(ad->original_type))
+ {
+ s = scopedNameToString(ad->original_type->fqname);
+ on_heap = TRUE;
+
+ nr_derefs -= ad->original_type->type.nrderefs;
- /* For the moment only handle non-pointer, non-reference base types. */
- if (ad->nrderefs == 0 && !isReference(ad))
+ if (isReference(&ad->original_type->type))
+ is_reference = FALSE;
+ }
+ else
switch (ad->atype)
{
+ case template_type:
+ {
+ templateDef *td = ad->u.td;
+
+ s = scopedNameToString(td->fqname);
+ append(&s, "<");
+
+ for (i = 0; i < td->types.nrArgs; ++i)
+ {
+ char *sub_type = type2string(&td->types.args[i]);
+
+ if (i > 0)
+ append(&s, ",");
+
+ append(&s, sub_type);
+ free(sub_type);
+ }
+
+ if (s[strlen(s) - 1] == '>')
+ append(&s, " >");
+ else
+ append(&s, ">");
+
+ on_heap = TRUE;
+ break;
+ }
+
+ case defined_type:
+ s = scopedNameToString(ad->u.snd);
+ on_heap = TRUE;
+ break;
+
case ustring_type:
- return "unsigned char";
+ s = "unsigned char";
+ break;
case string_type:
- return "char";
+ s = "char";
+ break;
case sstring_type:
- return "signed char";
+ s = "signed char";
+ break;
case wstring_type:
- return "wchar_t";
+ s = "wchar_t";
+ break;
case ushort_type:
- return "unsigned short";
+ s = "unsigned short";
+ break;
case short_type:
- return "short";
+ s = "short";
+ break;
case uint_type:
- return "unsigned int";
+ s = "unsigned int";
+ break;
case int_type:
case cint_type:
- return "int";
+ s = "int";
+ break;
case ulong_type:
- return "unsigned long";
+ s = "unsigned long";
+ break;
case long_type:
- return "long";
+ s = "long";
+ break;
case ulonglong_type:
- return "unsigned long long";
+ s = "unsigned long long";
+ break;
case longlong_type:
- return "long long";
+ s = "long long";
+ break;
case float_type:
case cfloat_type:
- return "float";
+ s = "float";
+ break;
case double_type:
case cdouble_type:
- return "double";
+ s = "double";
+ break;
case bool_type:
case cbool_type:
- return "bool";
+ s = "bool";
+ break;
+
+ default:
+ fatal("Unsupported type argument to type2string()\n");
}
- fatalScopedName(ename);
- fatal(": unsupported type argument to template class instantiation\n");
+ /* Make sure the string is on the heap. */
+ if (!on_heap)
+ s = sipStrdup(s);
- return NULL;
+ while (nr_derefs-- > 0)
+ append(&s, "*");
+
+ if (is_reference)
+ append(&s, "&");
+
+ return s;
}
@@ -3579,7 +3621,7 @@ static void instantiateClassTemplate(sipSpec *pt, moduleDef *mod,
*cd = *tcd->cd;
resetIsTemplateClass(cd);
- cd->pyname = scopedNameTail(fqname);
+ cd->pyname = cacheName(pt, scopedNameTail(fqname));
cd->td = td;
/* Handle the interface file. */
@@ -3599,7 +3641,7 @@ static void instantiateClassTemplate(sipSpec *pt, moduleDef *mod,
if (inMainModule())
{
setIsUsedName(cd->iff->name);
- setIsClassName(cd->iff->name);
+ setIsUsedName(cd->pyname);
}
cd->ecd = currentScope();
@@ -3811,10 +3853,19 @@ static void instantiateTemplateEnums(sipSpec *pt, classTmplDef *tcd,
*ed = *ted;
if (ed->fqcname != NULL)
+ {
ed->fqcname = text2scopedName(cd, scopedNameTail(ed->fqcname));
+ ed->cname = cacheName(pt, scopedNameToString(ed->fqcname));
+ }
- if (ed->pyname != NULL && inMainModule())
- setIsUsedName(ed->pyname);
+ if (inMainModule())
+ {
+ if (ed->pyname != NULL)
+ setIsUsedName(ed->pyname);
+
+ if (ed->cname != NULL)
+ setIsUsedName(ed->cname);
+ }
ed->ecd = cd;
ed->module = mod;
@@ -3877,8 +3928,7 @@ static void instantiateTemplateVars(sipSpec *pt, classTmplDef *tcd,
vd->getcode = templateCode(pt, used, vd->getcode, type_names, type_values);
vd->setcode = templateCode(pt, used, vd->setcode, type_names, type_values);
- vd->next = pt->vars;
- pt->vars = vd;
+ addVariable(pt, vd);
}
}
@@ -4022,10 +4072,7 @@ codeBlock *templateCode(sipSpec *pt, ifaceFileList **used, codeBlock *ocb,
else
{
static char *gen_names[] = {
- "sipForceConvertToTransfer_",
- "sipForceConvertTo_",
- "sipConvertFromTransfer_",
- "sipConvertFrom_",
+ "sipType_",
"sipClass_",
"sipEnum_",
"sipException_",
@@ -4176,7 +4223,7 @@ static int foundInScope(scopedNameDef *fq_name, scopedNameDef *rel_name)
snd = copyScopedName(classFQCName(scope));
appendScopedName(&snd, copyScopedName(rel_name));
- found = sameScopedName(fq_name, snd);
+ found = (compareScopedNames(fq_name, snd) == 0);
freeScopedName(snd);
@@ -4184,7 +4231,7 @@ static int foundInScope(scopedNameDef *fq_name, scopedNameDef *rel_name)
return TRUE;
}
- return sameScopedName(fq_name, rel_name);
+ return compareScopedNames(fq_name, rel_name) == 0;
}
@@ -4194,7 +4241,7 @@ static int foundInScope(scopedNameDef *fq_name, scopedNameDef *rel_name)
static void newTypedef(sipSpec *pt, moduleDef *mod, char *name, argDef *type,
optFlags *optflgs)
{
- typedefDef *td;
+ typedefDef *td, **tdp;
scopedNameDef *fqname;
classDef *scope;
@@ -4218,14 +4265,24 @@ static void newTypedef(sipSpec *pt, moduleDef *mod, char *name, argDef *type,
}
}
- /* Check it doesn't already exist. */
- for (td = pt->typedefs; td != NULL; td = td->next)
- if (sameScopedName(td->fqname, fqname))
+ /*
+ * Check it doesn't already exist and find the position in the sorted list
+ * where it should be put.
+ */
+ for (tdp = &pt->typedefs; *tdp != NULL; tdp = &(*tdp)->next)
+ {
+ int res = compareScopedNames((*tdp)->fqname, fqname);
+
+ if (res == 0)
{
fatalScopedName(fqname);
fatal(" already defined\n");
}
+ if (res > 0)
+ break;
+ }
+
td = sipMalloc(sizeof (typedefDef));
td->tdflags = 0;
@@ -4233,14 +4290,14 @@ static void newTypedef(sipSpec *pt, moduleDef *mod, char *name, argDef *type,
td->ecd = scope;
td->module = mod;
td->type = *type;
- td->next = pt->typedefs;
+
+ td->next = *tdp;
+ *tdp = td;
if (findOptFlag(optflgs, "NoTypeName", bool_flag) != NULL)
setNoTypeName(td);
mod->nrtypedefs++;
-
- pt->typedefs = td;
}
@@ -4341,12 +4398,11 @@ static void newVar(sipSpec *pt,moduleDef *mod,char *name,int isstatic,
var -> accessfunc = acode;
var -> getcode = gcode;
var -> setcode = scode;
- var -> next = pt -> vars;
if (isstatic || (escope != NULL && escope->iff->type == namespace_iface))
setIsStaticVar(var);
- pt -> vars = var;
+ addVariable(pt, var);
}
@@ -4433,7 +4489,6 @@ static void newFunction(sipSpec *pt,moduleDef *mod,int sflags,int isstatic,
signatureDef *cppsig)
{
classDef *cd = currentScope();
- nameDef *pname;
int factory, xferback, no_arg_parser;
overDef *od, **odp, **headp;
optFlag *of;
@@ -4550,7 +4605,7 @@ static void newFunction(sipSpec *pt,moduleDef *mod,int sflags,int isstatic,
if (isvirt)
{
- if (isSignal(od) && !optNoEmitters(pt))
+ if (isSignal(od) && pluginPyQt3(pt))
yyerror("Virtual signals aren't supported");
setIsVirtual(od);
@@ -4669,26 +4724,32 @@ static const char *getPythonName(optFlags *optflgs, const char *cname)
/*
- * Cache a name in a module.
+ * Cache a name in a module. Entries in the cache are stored in order of
+ * decreasing length.
*/
nameDef *cacheName(sipSpec *pt, const char *name)
{
- nameDef *nd;
+ nameDef *nd, **ndp = &pt->namecache;
+ size_t len = strlen(name);
- /* See if it already exists. */
- for (nd = pt->namecache; nd != NULL; nd = nd->next)
- if (strcmp(nd->text, name) == 0)
+ /* Skip entries that are too large. */
+ while (*ndp != NULL && (*ndp)->len > len)
+ ndp = &(*ndp)->next;
+
+ /* Check entries that are the right length. */
+ for (nd = *ndp; nd != NULL && nd->len == len; nd = nd->next)
+ if (memcmp(nd->text, name, len) == 0)
return nd;
/* Create a new one. */
nd = sipMalloc(sizeof (nameDef));
nd->nameflags = 0;
- nd->module = currentSpec->module;
nd->text = name;
- nd->next = pt->namecache;
+ nd->len = len;
+ nd->next = *ndp;
- pt->namecache = nd;
+ *ndp = nd;
return nd;
}
@@ -4701,7 +4762,7 @@ static memberDef *findFunction(sipSpec *pt, moduleDef *mod, classDef *cd,
const char *pname, int hwcode, int nrargs, int no_arg_parser)
{
static struct slot_map {
- char *name; /* The slot name. */
+ const char *name; /* The slot name. */
slotType type; /* The corresponding type. */
int needs_hwcode; /* Set if handwritten code is required. */
int nrargs; /* Nr. of arguments. */
@@ -4768,6 +4829,7 @@ static memberDef *findFunction(sipSpec *pt, moduleDef *mod, classDef *cd,
yyerror("This Python slot requires %MethodCode");
if (sm->nrargs >= 0)
+ {
if (cd == NULL)
{
/* Global operators need one extra argument. */
@@ -4776,6 +4838,7 @@ static memberDef *findFunction(sipSpec *pt, moduleDef *mod, classDef *cd,
}
else if (sm->nrargs != nrargs)
yyerror("Incorrect number of arguments to Python slot");
+ }
st = sm->type;
@@ -4939,7 +5002,7 @@ static void checkAttributes(sipSpec *pt, moduleDef *mod, classDef *pyscope,
if (cd -> ecd != pyscope || cd -> pyname == NULL)
continue;
- if (strcmp(cd->pyname, attr) == 0 && !isExternal(cd))
+ if (strcmp(cd->pyname->text, attr) == 0 && !isExternal(cd))
yyerror("There is already a class or namespace in scope with the same Python name");
}
@@ -5424,52 +5487,36 @@ static int getDeprecated(optFlags *optflgs)
/*
- * Return TRUE if the QtNoEmitters option was specified.
- */
-int optNoEmitters(sipSpec *pt)
-{
- return optFind(pt, "QtNoEmitters");
-}
-
-
-/*
- * Return TRUE if the QtRegisterTypes option was specified.
+ * Return TRUE if the PyQt3 plugin was specified.
*/
-int optRegisterTypes(sipSpec *pt)
+int pluginPyQt3(sipSpec *pt)
{
- return optFind(pt, "QtRegisterTypes");
+ return stringFind(pt->plugins, "PyQt3");
}
/*
- * Return TRUE if the Qt4Q_OBJECT option was specified.
+ * Return TRUE if the PyQt4 plugin was specified.
*/
-int optQ_OBJECT4(sipSpec *pt)
+int pluginPyQt4(sipSpec *pt)
{
- return optFind(pt, "Qt4Q_OBJECT");
+ return stringFind(pt->plugins, "PyQt4");
}
/*
- * Return TRUE if the AssignmentHelpers option was specified.
+ * Return TRUE if a list of strings contains a given entry.
*/
-int optAssignmentHelpers(sipSpec *pt)
+static int stringFind(stringList *sl, const char *s)
{
- return optFind(pt, "AssignmentHelpers");
-}
-
-
-/*
- * Return TRUE if a particular option was specified with %SIPOptions.
- */
-static int optFind(sipSpec *pt, const char *opt)
-{
- stringList *sl;
-
- for (sl = pt->options; sl != NULL; sl = sl->next)
- if (strcmp(sl->s, opt) == 0)
+ while (sl != NULL)
+ {
+ if (strcmp(sl->s, s) == 0)
return TRUE;
+ sl = sl->next;
+ }
+
return FALSE;
}
@@ -5477,9 +5524,12 @@ static int optFind(sipSpec *pt, const char *opt)
/*
* Set the name of a module.
*/
-static void setModuleName(moduleDef *mod, const char *fullname)
+static void setModuleName(sipSpec *pt, moduleDef *mod, const char *fullname)
{
- mod->fullname = fullname;
+ mod->fullname = cacheName(pt, fullname);
+
+ if (inMainModule())
+ setIsUsedName(mod->fullname);
if ((mod->name = strrchr(fullname, '.')) != NULL)
mod->name++;
@@ -5528,3 +5578,23 @@ static classDef *completeClass(scopedNameDef *snd, optFlags *of, int has_def)
return cd;
}
+
+
+/*
+ * Add a variable to the list so that the list remains sorted.
+ */
+static void addVariable(sipSpec *pt, varDef *vd)
+{
+ varDef **at = &pt->vars;
+
+ while (*at != NULL)
+ {
+ if (strcmp(vd->pyname->text, (*at)->pyname->text) < 0)
+ break;
+
+ at = &(*at)->next;
+ }
+
+ vd->next = *at;
+ *at = vd;
+}
sipgen/parser.y
@@ -1,7 +1,7 @@
/*
* The main header file for SIP.
*
- * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
+ * Copyright (c) 2009 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -39,7 +39,7 @@
/* For convenience. */
-#define classBaseName(cd) ((cd)->iff->name->text)
+#define classBaseName(cd) scopedNameTail((cd)->iff->fqcname)
#define classFQCName(cd) ((cd)->iff->fqcname)
@@ -85,11 +85,10 @@
#define CLASS_NO_DEFAULT_CTORS 0x00200000 /* Don't create default ctors. */
#define CLASS_QOBJECT_SUB 0x00400000 /* It is derived from QObject. */
#define CLASS_DTOR_HOLD_GIL 0x00800000 /* The dtor holds the GIL. */
-#define CLASS_QT_META_TYPE 0x01000000 /* Register as a Qt meta type. */
+#define CLASS_ASSIGN_HELPER 0x01000000 /* Generate an assignment helper. */
#define CLASS_NO_QMETAOBJECT 0x02000000 /* It has no QMetaObject. */
-#define CLASS_CAN_ASSIGN 0x04000000 /* It has an assignment operator. */
-#define CLASS_IS_TEMPLATE 0x08000000 /* It is a template class. */
-#define CLASS_IS_DEPRECATED 0x10000000 /* It is deprecated. */
+#define CLASS_IS_TEMPLATE 0x04000000 /* It is a template class. */
+#define CLASS_IS_DEPRECATED 0x08000000 /* It is deprecated. */
#define hasSigSlots(cd) ((cd)->classflags & CLASS_HAS_SIGSLOTS)
#define setHasSigSlots(cd) ((cd)->classflags |= CLASS_HAS_SIGSLOTS)
@@ -125,12 +124,10 @@
#define setIsQObjectSubClass(cd) ((cd)->classflags |= CLASS_QOBJECT_SUB)
#define isHoldGILDtor(c) ((cd)->classflags & CLASS_DTOR_HOLD_GIL)
#define setIsHoldGILDtor(c) ((cd)->classflags |= CLASS_DTOR_HOLD_GIL)
-#define registerQtMetaType(c) ((cd)->classflags & CLASS_QT_META_TYPE)
-#define setRegisterQtMetaType(c) ((cd)->classflags |= CLASS_QT_META_TYPE)
-#define noQMetaObject(c) ((cd)->classflags & CLASS_NO_QMETAOBJECT)
-#define setNoQMetaObject(c) ((cd)->classflags |= CLASS_NO_QMETAOBJECT)
-#define canAssign(c) ((cd)->classflags & CLASS_CAN_ASSIGN)
-#define setCanAssign(c) ((cd)->classflags |= CLASS_CAN_ASSIGN)
+#define assignmentHelper(c) ((cd)->classflags & CLASS_ASSIGN_HELPER)
+#define setAssignmentHelper(c) ((cd)->classflags |= CLASS_ASSIGN_HELPER)
+#define noPyQt4QMetaObject(c) ((cd)->classflags & CLASS_NO_QMETAOBJECT)
+#define setPyQt4NoQMetaObject(c) ((cd)->classflags |= CLASS_NO_QMETAOBJECT)
#define isTemplateClass(cd) ((cd)->classflags & CLASS_IS_TEMPLATE)
#define setIsTemplateClass(cd) ((cd)->classflags |= CLASS_IS_TEMPLATE)
#define resetIsTemplateClass(cd) ((cd)->classflags &= ~CLASS_IS_TEMPLATE)
@@ -307,7 +304,7 @@
#define ARG_RESULT_SIZE 0x2000 /* It defines the result size. */
#define isReference(a) ((a)->argflags & ARG_IS_REF)
-#define setIsReference(a) ((a)-> argflags |= ARG_IS_REF)
+#define setIsReference(a) ((a)->argflags |= ARG_IS_REF)
#define resetIsReference(a) ((a)->argflags &= ~ARG_IS_REF)
#define isConstArg(a) ((a)->argflags & ARG_IS_CONST)
#define setIsConstArg(a) ((a)->argflags |= ARG_IS_CONST)
@@ -341,14 +338,13 @@
/* Handle name flags. */
#define NAME_IS_USED 0x01 /* It is used in the main module. */
-#define NAME_IS_CLASS 0x02 /* It is the name of a class. */
+#define NAME_IS_SUBSTR 0x02 /* It is a substring of another. */
#define isUsedName(n) ((n)->nameflags & NAME_IS_USED)
#define setIsUsedName(n) ((n)->nameflags |= NAME_IS_USED)
#define resetIsUsedName(n) ((n)->nameflags &= ~NAME_IS_USED)
-#define isClassName(n) ((n)->nameflags & NAME_IS_CLASS)
-#define setIsClassName(n) ((n)->nameflags |= NAME_IS_CLASS)
-#define resetIsClassName(n) ((n)->nameflags &= ~NAME_IS_CLASS)
+#define isSubstring(n) ((n)->nameflags & NAME_IS_SUBSTR)
+#define setIsSubstring(n) ((n)->nameflags |= NAME_IS_SUBSTR)
/* Handle virtual handler flags. */
@@ -554,26 +550,13 @@ typedef struct _scopedNameDef {
typedef struct _nameDef {
int nameflags; /* The name flags. */
- struct _moduleDef *module; /* The main module. */
const char *text; /* The text of the name. */
+ size_t len; /* The length of the name. */
+ size_t offset; /* The offset in the string pool. */
struct _nameDef *next; /* Next in the list. */
} nameDef;
-/*
- * A node in the tree of classes used to determine the order in which the
- * classes need to be created.
- */
-
-typedef struct _nodeDef {
- int ordered; /* Set if in order. */
- struct _classDef *cd; /* The class. */
- struct _nodeDef *parent; /* The parent. */
- struct _nodeDef *child; /* The first child. */
- struct _nodeDef *next; /* The next sibling. */
-} nodeDef;
-
-
/* A literal code block. */
typedef struct _codeBlock {
@@ -584,52 +567,6 @@ typedef struct _codeBlock {
} codeBlock;
-/* A module definition. */
-
-typedef struct _moduleDef {
- const char *fullname; /* The full module name. */
- const char *name; /* The module base name. */
- int version; /* The module version. */
- int modflags; /* The module flags. */
- int qobjclass; /* QObject class, -1 if none. */
- struct _memberDef *othfuncs; /* List of other functions. */
- struct _overDef *overs; /* Global overloads. */
- codeBlock *hdrcode; /* Header code. */
- codeBlock *cppcode; /* Global C++ code. */
- codeBlock *copying; /* Software license. */
- codeBlock *preinitcode; /* Pre-initialisation code. */
- codeBlock *postinitcode; /* Post-initialisation code. */
- codeBlock *unitcode; /* Compilation unit code. */
- int parts; /* The number of parts generated. */
- char *file; /* The filename. */
- qualDef *qualifiers; /* The list of qualifiers. */
- nodeDef root; /* Root of class tree. */
- int nrtimelines; /* The nr. of timelines. */
- int nrclasses; /* The nr. of classes. */
- int nrexceptions; /* The nr. of exceptions. */
- int nrmappedtypes; /* The nr. of mapped types. */
- int nrenums; /* The nr. of named enums. */
- int nrtypedefs; /* The nr. of typedefs. */
- int nrvirthandlers; /* The nr. of virtual handlers. */
- struct _virtHandlerDef *virthandlers; /* The virtual handlers. */
- licenseDef *license; /* The software license. */
- struct _classDef *proxies; /* The list of proxy classes. */
- struct _moduleDef *container; /* The container module, if any. */
- struct _ifaceFileList *used; /* Interface files used. */
- struct _moduleListDef *allimports; /* The list of all imports. */
- struct _moduleListDef *imports; /* The list of direct imports. */
- struct _moduleDef *next; /* Next in the list. */
-} moduleDef;
-
-
-/* An entry in a linked module list. */
-
-typedef struct _moduleListDef {
- moduleDef *module; /* The module itself. */
- struct _moduleListDef *next; /* The next in the list. */
-} moduleListDef;
-
-
/* The arguments to a throw specifier. */
typedef struct _throwArgs {
@@ -708,6 +645,51 @@ typedef struct _fcallDef {
} fcallDef;
+/* A module definition. */
+typedef struct _moduleDef {
+ nameDef *fullname; /* The full module name. */
+ const char *name; /* The module base name. */
+ int version; /* The module version. */
+ int modflags; /* The module flags. */
+ int qobjclass; /* QObject class, -1 if none. */
+ struct _memberDef *othfuncs; /* List of other functions. */
+ struct _overDef *overs; /* Global overloads. */
+ nameDef *defmetatype; /* The optional default meta-type. */
+ nameDef *defsupertype; /* The optional default super-type. */
+ codeBlock *hdrcode; /* Header code. */
+ codeBlock *cppcode; /* Global C++ code. */
+ codeBlock *copying; /* Software license. */
+ codeBlock *preinitcode; /* Pre-initialisation code. */
+ codeBlock *initcode; /* Initialisation code. */
+ codeBlock *postinitcode; /* Post-initialisation code. */
+ codeBlock *unitcode; /* Compilation unit code. */
+ int parts; /* The number of parts generated. */
+ char *file; /* The filename. */
+ qualDef *qualifiers; /* The list of qualifiers. */
+ argDef *types; /* The array of numbered types. */
+ int nrtypes; /* The number of numbered types. */
+ int nrtimelines; /* The nr. of timelines. */
+ int nrexceptions; /* The nr. of exceptions. */
+ int nrtypedefs; /* The nr. of typedefs. */
+ int nrvirthandlers; /* The nr. of virtual handlers. */
+ struct _virtHandlerDef *virthandlers; /* The virtual handlers. */
+ licenseDef *license; /* The software license. */
+ struct _classDef *proxies; /* The list of proxy classes. */
+ struct _moduleDef *container; /* The container module, if any. */
+ struct _ifaceFileList *used; /* Interface files used. */
+ struct _moduleListDef *allimports; /* The list of all imports. */
+ struct _moduleListDef *imports; /* The list of direct imports. */
+ struct _moduleDef *next; /* Next in the list. */
+} moduleDef;
+
+
+/* An entry in a linked module list. */
+typedef struct _moduleListDef {
+ moduleDef *module; /* The module itself. */
+ struct _moduleListDef *next; /* The next in the list. */
+} moduleListDef;
+
+
/* An interface file definition. */
typedef struct _ifaceFileDef {
@@ -734,6 +716,7 @@ typedef struct _ifaceFileList {
typedef struct _mappedTypeDef {
int mtflags; /* The mapped type flags. */
argDef type; /* The type being mapped. */
+ nameDef *cname; /* The C/C++ name. */
int mappednr; /* The mapped type number. */
ifaceFileDef *iff; /* The interface file. */
codeBlock *convfromcode; /* Convert from C++ code. */
@@ -853,9 +836,11 @@ typedef struct _enumMemberDef {
typedef struct _enumDef {
int enumflags; /* The enum flags. */
- scopedNameDef *fqcname; /* The name (may be NULL). */
nameDef *pyname; /* The Python name (may be NULL). */
+ scopedNameDef *fqcname; /* The C/C++ name (may be NULL). */
+ nameDef *cname; /* The C/C++ name (may be NULL). */
int enumnr; /* The enum number. */
+ int enum_idx; /* The enum index within the module. */
struct _classDef *ecd; /* The enclosing class. */
moduleDef *module; /* The owning module. */
enumMemberDef *members; /* The list of members. */
@@ -915,15 +900,16 @@ typedef struct _mroDef {
typedef struct _classDef {
int classflags; /* The class flags. */
- int userflags; /* The user type flags. */
+ int pyqt4_flags; /* The PyQt4 specific flags. */
int classnr; /* The class number. */
- const char *pyname; /* The Python name. */
+ nameDef *pyname; /* The Python name. */
ifaceFileDef *iff; /* The interface file. */
struct _classDef *ecd; /* The enclosing scope. */
struct _classDef *real; /* The real class if this is a proxy or extender. */
- nodeDef *node; /* Position in class tree. */
classList *supers; /* The parent classes. */
mroDef *mro; /* The super-class hierarchy. */
+ nameDef *metatype; /* The meta-type. */
+ nameDef *supertype; /* The super-type. */
templateDef *td; /* The instantiated template. */
ctorDef *ctors; /* The constructors. */
ctorDef *defctor; /* The default ctor. */
@@ -987,7 +973,7 @@ typedef struct {
codeBlock *docs; /* Documentation. */
int sigslots; /* Set if signals or slots are used. */
int genc; /* Set if we are generating C code. */
- struct _stringList *options; /* The list of options. */
+ struct _stringList *plugins; /* The list of plugins. */
} sipSpec;
@@ -1024,7 +1010,8 @@ void warning(char *,...);
void fatal(char *,...);
void fatalScopedName(scopedNameDef *);
int setInputFile(FILE *open_fp, parserContext *pc, int optional);
-void *sipMalloc(size_t);
+void *sipMalloc(size_t n);
+void *sipCalloc(size_t nr, size_t n);
char *sipStrdup(const char *);
char *concat(const char *, ...);
void append(char **, const char *);
@@ -1033,7 +1020,7 @@ int excludedFeature(stringList *,qualDef *);
int sameSignature(signatureDef *,signatureDef *,int);
int sameTemplateSignature(signatureDef *tmpl_sd, signatureDef *args_sd,
int deep);
-int sameScopedName(scopedNameDef *,scopedNameDef *);
+int compareScopedNames(scopedNameDef *snd1, scopedNameDef *snd2);
int sameBaseType(argDef *,argDef *);
char *scopedNameTail(scopedNameDef *);
scopedNameDef *text2scopePart(char *);
@@ -1044,7 +1031,6 @@ void appendToClassList(classList **,classDef *);
void appendCodeBlock(codeBlock **headp, codeBlock *new);
void prcode(FILE *fp, const char *fmt, ...);
void prOverloadName(FILE *fp, overDef *od);
-void prScopedPythonName(FILE *fp, classDef *scope, const char *pyname);
void prOverloadDecl(FILE *fp, classDef *context, overDef *od, int defval);
void searchTypedefs(sipSpec *pt, scopedNameDef *snd, argDef *ad);
int isIntReturnSlot(memberDef *md);
@@ -1052,15 +1038,13 @@ int isLongReturnSlot(memberDef *md);
int isVoidReturnSlot(memberDef *md);
int isNumberSlot(memberDef *md);
int isRichCompareSlot(memberDef *md);
-mappedTypeDef *allocMappedType(argDef *type);
+mappedTypeDef *allocMappedType(sipSpec *pt, argDef *type);
void appendString(stringList **headp, const char *s);
void appendTypeStrings(scopedNameDef *ename, signatureDef *patt, signatureDef *src, signatureDef *known, scopedNameDef **names, scopedNameDef **values);
codeBlock *templateCode(sipSpec *pt, ifaceFileList **used, codeBlock *ocb, scopedNameDef *names, scopedNameDef *values);
ifaceFileDef *findIfaceFile(sipSpec *pt, moduleDef *mod, scopedNameDef *fqname, ifaceFileType iftype, argDef *ad);
-int optNoEmitters(sipSpec *pt);
-int optRegisterTypes(sipSpec *pt);
-int optQ_OBJECT4(sipSpec *pt);
-int optAssignmentHelpers(sipSpec *pt);
+int pluginPyQt3(sipSpec *pt);
+int pluginPyQt4(sipSpec *pt);
void yywarning(char *);
nameDef *cacheName(sipSpec *pt, const char *name);
@@ -1076,6 +1060,7 @@ typedef enum {
string_flag,
name_flag,
opt_name_flag,
+ dotted_name_flag,
integer_flag
} flagType;
sipgen/sip.h
@@ -1,6 +1,6 @@
# This is the build file for the code generator.
#
-# Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
+# Copyright (c) 2009 Riverbank Computing Limited <info@riverbankcomputing.com>
#
# This file is part of SIP.
#
sipgen/sipgen.sbf
@@ -1,7 +1,7 @@
/*
* The parse tree transformation module for SIP.
*
- * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
+ * Copyright (c) 2009 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -32,10 +32,8 @@ static void addUniqueModule(moduleDef *mod, moduleDef *imp);
static void ensureInput(classDef *,overDef *,argDef *);
static void defaultInput(argDef *);
static void defaultOutput(argDef *ad);
-static void assignClassNrs(sipSpec *,moduleDef *,nodeDef *);
-static void assignEnumNrs(sipSpec *pt);
-static void positionClass(classDef *);
-static void addNodeToParent(nodeDef *,classDef *);
+static void createSortedNumberedTypesTable(sipSpec *pt, moduleDef *mod);
+static int compareTypes(const void *t1, const void *t2);
static void addAutoOverload(sipSpec *,classDef *,overDef *);
static void ifaceFileIsUsed(ifaceFileList **used, argDef *ad);
static void ifaceFilesAreUsedByOverload(ifaceFileList **used, overDef *od);
@@ -63,7 +61,6 @@ static void fatalNoDefinedType(scopedNameDef *);
static void getBaseType(sipSpec *,moduleDef *,classDef *,argDef *);
static void searchScope(sipSpec *,classDef *,scopedNameDef *,argDef *);
static void searchMappedTypes(sipSpec *,scopedNameDef *,argDef *);
-void searchTypedefs(sipSpec *pt, scopedNameDef *snd, argDef *ad);
static void searchEnums(sipSpec *,scopedNameDef *,argDef *);
static void searchClasses(sipSpec *,moduleDef *mod,scopedNameDef *,argDef *);
static void appendToMRO(mroDef *,mroDef ***,classDef *);
@@ -81,6 +78,7 @@ static void addComplementarySlots(sipSpec *pt, classDef *cd);
static void addComplementarySlot(sipSpec *pt, classDef *cd, memberDef *md,
slotType cslot, const char *cslot_name);
static void resolveInstantiatedClassTemplate(sipSpec *pt, argDef *type);
+static void setStringPoolOffsets(sipSpec *pt);
/*
@@ -93,14 +91,13 @@ void transform(sipSpec *pt)
classDef *cd, *rev, **tail;
classList *newl;
overDef *od;
- mappedTypeDef *mtd;
/*
- * The class list has the main module's classes at the front and the
- * ones from the module at the most nested %Import at the end. This
- * affects some of the following algorithms, eg. when assigning class
- * numbers. We have to have consistency whenever a module is used. To
- * achieve this we reverse the order of the classes.
+ * The class list has the main module's classes at the front and the ones
+ * from the module at the most nested %Import at the end. This affects
+ * some of the following algorithms, eg. when assigning class numbers. We
+ * have to have consistency whenever a module is used. To achieve this we
+ * reverse the order of the classes.
*/
rev = NULL;
cd = pt -> classes;
@@ -136,6 +133,52 @@ void transform(sipSpec *pt)
setAllImports(mod);
}
+ /*
+ * Set the default meta-type for the main module if it doesn't have one
+ * explicitly set.
+ */
+ if (pt->module->defmetatype == NULL)
+ {
+ moduleListDef *mld;
+
+ for (mld = pt->module->allimports; mld != NULL; mld = mld->next)
+ {
+ if (mld->module->defmetatype == NULL)
+ continue;
+
+ if (pt->module->defmetatype == NULL)
+ pt->module->defmetatype = mld->module->defmetatype;
+ else if (pt->module->defmetatype != mld->module->defmetatype)
+ fatal("The %s module has imported different default meta-types %s and %s\n",
+ pt->module->fullname->text,
+ pt->module->defmetatype->text,
+ mld->module->defmetatype->text);
+ }
+ }
+
+ /*
+ * Set the default super-type for the main module if it doesn't have one
+ * explicitly set.
+ */
+ if (pt->module->defsupertype == NULL)
+ {
+ moduleListDef *mld;
+
+ for (mld = pt->module->allimports; mld != NULL; mld = mld->next)
+ {
+ if (mld->module->defsupertype == NULL)
+ continue;
+
+ if (pt->module->defsupertype == NULL)
+ pt->module->defsupertype = mld->module->defsupertype;
+ else if (pt->module->defsupertype != mld->module->defsupertype)
+ fatal("The %s module has imported different default super-types %s and %s\n",
+ pt->module->fullname->text,
+ pt->module->defsupertype->text,
+ mld->module->defsupertype->text);
+ }
+ }
+
/* Check each class has been defined. */
for (cd = pt -> classes; cd != NULL; cd = cd -> next)
if (cd -> iff -> module == NULL)
@@ -199,22 +242,9 @@ void transform(sipSpec *pt)
if (!noDefaultCtors(cd) && !isOpaque(cd) && cd->iff->type != namespace_iface)
addDefaultCopyCtor(cd);
- /*
- * Go through each class and add it to it's defining module's tree of
- * classes. The tree reflects the namespace hierarchy.
- */
- for (cd = pt->classes; cd != NULL; cd = cd->next)
- addNodeToParent(&cd->iff->module->root, cd);
-
- for (cd = pt -> classes; cd != NULL; cd = cd -> next)
- positionClass(cd);
-
- /* Assign module specific class numbers for all modules. */
+ /* Create the array of numbered types sorted by type name. */
for (mod = pt->modules; mod != NULL; mod = mod->next)
- assignClassNrs(pt, mod, &mod->root);
-
- /* Assign module specific enum numbers for all enums. */
- assignEnumNrs(pt);
+ createSortedNumberedTypesTable(pt, mod);
/* Add any automatically generated methods. */
for (cd = pt -> classes; cd != NULL; cd = cd -> next)
@@ -222,10 +252,6 @@ void transform(sipSpec *pt)
if (isAutoGen(od))
addAutoOverload(pt,cd,od);
- /* Allocate mapped types numbers. */
- for (mtd = pt -> mappedtypes; mtd != NULL; mtd = mtd -> next)
- mtd -> mappednr = mtd -> iff -> module -> nrmappedtypes++;
-
/*
* Move casts and slots around to their correct classes (if in the same
* module) or create proxies for them (if cross-module).
@@ -282,10 +308,57 @@ void transform(sipSpec *pt)
}
/* Mark classes that should be registered as Qt meta types. */
- if (optRegisterTypes(pt))
+ if (pluginPyQt4(pt))
for (cd = pt->classes; cd != NULL; cd = cd->next)
if (generatingCodeForModule(pt, cd->iff->module))
registerMetaType(cd);
+
+ setStringPoolOffsets(pt);
+}
+
+
+/*
+ * Set the offset into the string pool for every used name.
+ */
+static void setStringPoolOffsets(sipSpec *pt)
+{
+ nameDef *nd;
+ size_t offset = 0;
+
+ for (nd = pt->namecache; nd != NULL; nd = nd->next)
+ {
+ size_t len;
+ nameDef *prev;
+
+ if (!isUsedName(nd))
+ continue;
+
+ /* See if the tail of a previous used name could be used instead. */
+ len = nd->len;
+
+ for (prev = pt->namecache; prev->len > len; prev = prev->next)
+ {
+ size_t pos;
+
+ if (!isUsedName(prev) || isSubstring(prev))
+ continue;
+
+ pos = prev->len - len;
+
+ if (memcmp(&prev->text[pos], nd->text, len) == 0)
+ {
+ setIsSubstring(nd);
+ nd->offset = prev->offset + pos;
+ break;
+ }
+ }
+
+ if (!isSubstring(nd))
+ {
+ nd->offset = offset;
+ offset += len + 1;
+ }
+ }
}
@@ -429,7 +502,7 @@ static void registerMetaType(classDef *cd)
if (pub_def_ctor && pub_copy_ctor)
{
- setRegisterQtMetaType(cd);
+ setAssignmentHelper(cd);
addToUsedList(&cd->iff->module->used, cd->iff);
}
}
@@ -771,38 +844,13 @@ static classDef *getProxy(moduleDef *mod, classDef *cd)
pcd = sipMalloc(sizeof (classDef));
- pcd->classflags = 0;
- pcd->userflags = 0;
pcd->classnr = -1;
pcd->pyname = cd->pyname;
pcd->iff = cd->iff;
pcd->ecd = cd->ecd;
pcd->real = cd;
- pcd->node = NULL;
pcd->supers = cd->supers;
pcd->mro = cd->mro;
- pcd->td = NULL;
- pcd->ctors = NULL;
- pcd->defctor = NULL;
- pcd->dealloccode = NULL;
- pcd->dtorcode = NULL;
- pcd->dtorexceptions = NULL;
- pcd->members = NULL;
- pcd->overs = NULL;
- pcd->casts = NULL;
- pcd->vmembers = NULL;
- pcd->visible = NULL;
- pcd->cppcode = NULL;
- pcd->convtosubcode = NULL;
- pcd->subbase = NULL;
- pcd->convtocode = NULL;
- pcd->travcode = NULL;
- pcd->clearcode = NULL;
- pcd->readbufcode = NULL;
- pcd->writebufcode = NULL;
- pcd->segcountcode = NULL;
- pcd->charbufcode = NULL;
- pcd->picklecode = NULL;
pcd->next = mod->proxies;
mod->proxies = pcd;
@@ -1000,13 +1048,13 @@ static void addAutoOverload(sipSpec *pt,classDef *autocd,overDef *autood)
/*
* Set the complete hierarchy for a class.
*/
-static void setHierarchy(sipSpec *pt,classDef *base,classDef *cd,
- classList **head)
+static void setHierarchy(sipSpec *pt, classDef *base, classDef *cd,
+ classList **head)
{
- mroDef **tailp = &cd -> mro;
+ mroDef **tailp = &cd->mro;
/* See if it has already been done. */
- if (cd -> mro != NULL)
+ if (cd->mro != NULL)
return;
if (cd->ecd != NULL)
@@ -1017,30 +1065,28 @@ static void setHierarchy(sipSpec *pt,classDef *base,classDef *cd,
setIsDeprecatedClass(cd);
}
- if (cd -> iff -> type == class_iface)
+ if (cd->iff->type == class_iface)
{
classList *cl;
/* The first thing is itself. */
- appendToMRO(cd -> mro,&tailp,cd);
+ appendToMRO(cd->mro, &tailp, cd);
if (cd->convtosubcode != NULL)
cd->subbase = cd;
/* Now do it's superclasses. */
- for (cl = cd -> supers; cl != NULL; cl = cl -> next)
+ for (cl = cd->supers; cl != NULL; cl = cl->next)
{
mroDef *mro;
- /*
- * Make sure the super-class's hierarchy has been done.
- */
- setHierarchy(pt,base,cl -> cd,head);
+ /* Make sure the super-class's hierarchy has been done. */
+ setHierarchy(pt, base, cl->cd, head);
/* Append the super-classes hierarchy. */
- for (mro = cl -> cd -> mro; mro != NULL; mro = mro -> next)
+ for (mro = cl->cd->mro; mro != NULL; mro = mro->next)
{
- appendToMRO(cd -> mro,&tailp,mro -> cd);
+ appendToMRO(cd->mro, &tailp, mro->cd);
if (isDeprecatedClass(mro->cd))
setIsDeprecatedClass(cd);
@@ -1067,6 +1113,29 @@ static void setHierarchy(sipSpec *pt,classDef *base,classDef *cd,
cd->subbase = mro->cd->subbase;
}
}
+
+ /*
+ * If the class doesn't have an explicit meta-type then inherit from
+ * the module's default.
+ */
+ if (cd->metatype == NULL && cd->supers == NULL)
+ cd->metatype = cd->iff->module->defmetatype;
+
+ if (cd->metatype != NULL && generatingCodeForModule(pt, cd->iff->module))
+ setIsUsedName(cd->metatype);
+
+ /*
+ * If the class doesn't have an explicit super-type then inherit from
+ * the module's default.
+ */
+ if (cd->supertype == NULL && cd->supers == NULL)
+ cd->supertype = cd->iff->module->defsupertype;
+
+ if (cd->supertype != NULL && strcmp(cd->supertype->text, "sip.wrapper") == 0)
+ cd->supertype = NULL;
+
+ if (cd->supertype != NULL && generatingCodeForModule(pt, cd->iff->module))
+ setIsUsedName(cd->supertype);
}
/*
@@ -1297,10 +1366,6 @@ static void addDefaultCopyCtor(classDef *cd)
*tailp = copyct;
}
-
- /* We assume it has an assignment operator if it has a public copy ctor. */
- if (isPublicCtor(copyct))
- setCanAssign(cd);
}
@@ -1416,7 +1481,7 @@ static void getVisibleMembers(sipSpec *pt, classDef *cd)
if (!generatingCodeForModule(pt, cd->iff->module))
continue;
- if (isProtected(od) || (isSignal(od) && !optNoEmitters(pt)))
+ if (isProtected(od) || (isSignal(od) && pluginPyQt3(pt)))
setIsUsedName(md->pyname);
}
}
@@ -2262,31 +2327,31 @@ int sameBaseType(argDef *a1, argDef *a2)
* name. Hopefully this won't have wider side effects.
*/
if (a1->atype == class_type && a2->atype == defined_type)
- return sameScopedName(a1->u.cd->iff->fqcname, a2->u.snd);
+ return compareScopedNames(a1->u.cd->iff->fqcname, a2->u.snd) == 0;
if (a1->atype == defined_type && a2->atype == class_type)
- return sameScopedName(a1->u.snd, a2->u.cd->iff->fqcname);
+ return compareScopedNames(a1->u.snd, a2->u.cd->iff->fqcname) == 0;
return FALSE;
}
- switch (a1 -> atype)
+ switch (a1->atype)
{
case class_type:
- if (a1 -> u.cd != a2 -> u.cd)
+ if (a1->u.cd != a2->u.cd)
return FALSE;
break;
case enum_type:
- if (a1 -> u.ed != a2 -> u.ed)
+ if (a1->u.ed != a2->u.ed)
return FALSE;
break;
case slotcon_type:
case slotdis_type:
- if (!sameSignature(a1 -> u.sa,a2 -> u.sa,TRUE))
+ if (!sameSignature(a1->u.sa, a2->u.sa, TRUE))
return FALSE;
break;
@@ -2296,41 +2361,40 @@ int sameBaseType(argDef *a1, argDef *a2)
int a;
templateDef *td1, *td2;
- td1 = a1 -> u.td;
- td2 = a2 -> u.td;
+ td1 = a1->u.td;
+ td2 = a2->u.td;
- if (!sameScopedName(td1 -> fqname,td2 -> fqname) != 0 ||
- td1 -> types.nrArgs != td2 -> types.nrArgs)
+ if (compareScopedNames(td1->fqname, td2->fqname) != 0 ||
+ td1->types.nrArgs != td2->types.nrArgs)
return FALSE;
- for (a = 0; a < td1 -> types.nrArgs; ++a)
- if (!sameBaseType(&td1 -> types.args[a],&td2 -> types.args[a]))
+ for (a = 0; a < td1->types.nrArgs; ++a)
+ if (!sameBaseType(&td1->types.args[a], &td2->types.args[a]))
return FALSE;
break;
}
case struct_type:
- if (!sameScopedName(a1 -> u.sname,a2 -> u.sname) != 0)
+ if (compareScopedNames(a1->u.sname, a2->u.sname) != 0)
return FALSE;
break;
case defined_type:
- if (!sameScopedName(a1 -> u.snd,a2 -> u.snd))
+ if (compareScopedNames(a1->u.snd, a2->u.snd) != 0)
return FALSE;
break;
case mapped_type:
- if (a1 -> u.mtd != a2 -> u.mtd)
+ if (a1->u.mtd != a2->u.mtd)
return FALSE;
break;
}
/* Must be the same if we've got this far. */
-
return TRUE;
}
@@ -2381,18 +2445,25 @@ static int nextSignificantArg(signatureDef *sd, int a)
/*
- * Return TRUE if two scoped names are the same.
+ * The equivalent of strcmp() for scoped names.
*/
-
-int sameScopedName(scopedNameDef *snd1,scopedNameDef *snd2)
+int compareScopedNames(scopedNameDef *snd1, scopedNameDef *snd2)
{
- while (snd1 != NULL && snd2 != NULL && strcmp(snd1 -> name,snd2 -> name) == 0)
+ while (snd1 != NULL && snd2 != NULL)
{
- snd1 = snd1 -> next;
- snd2 = snd2 -> next;
+ int res = strcmp(snd1->name, snd2->name);
+
+ if (res != 0)
+ return res;
+
+ snd1 = snd1->next;
+ snd2 = snd2->next;
}
- return (snd1 == NULL && snd2 == NULL);
+ if (snd1 == NULL)
+ return (snd2 == NULL ? 0 : -1);
+
+ return 1;
}
@@ -2562,7 +2633,7 @@ static void getBaseType(sipSpec *pt, moduleDef *mod, classDef *defscope, argDef
mappedTypeTmplDef *mtt;
for (mtt = pt->mappedtypetemplates; mtt != NULL; mtt = mtt->next)
- if (sameScopedName(type->u.td->fqname, mtt->mt->type.u.td->fqname) && sameTemplateSignature(&mtt->mt->type.u.td->types, &type->u.td->types, TRUE))
+ if (compareScopedNames(type->u.td->fqname, mtt->mt->type.u.td->fqname) == 0 && sameTemplateSignature(&mtt->mt->type.u.td->types, &type->u.td->types, TRUE))
{
type->u.mtd = instantiateMappedTypeTemplate(pt, mod, mtt, type);
type->atype = mapped_type;
@@ -2595,7 +2666,8 @@ static void resolveInstantiatedClassTemplate(sipSpec *pt, argDef *type)
resolveInstantiatedClassTemplate(pt, &sd->args[a]);
for (cd = pt->classes; cd != NULL; cd = cd->next)
- if (cd->td != NULL && sameScopedName(cd->td->fqname, td->fqname) &&
+ if (cd->td != NULL &&
+ compareScopedNames(cd->td->fqname, td->fqname) == 0 &&
sameSignature(&cd->td->types, sd, TRUE))
{
type->atype = class_type;
@@ -2617,7 +2689,10 @@ static mappedTypeDef *instantiateMappedTypeTemplate(sipSpec *pt, moduleDef *mod,
type_names = type_values = NULL;
appendTypeStrings(type->u.td->fqname, &mtt->mt->type.u.td->types, &type->u.td->types, &mtt->sig, &type_names, &type_values);
- mtd = allocMappedType(type);
+ mtd = allocMappedType(pt, type);
+
+ if (generatingCodeForModule(pt, mod))
+ setIsUsedName(mtd->cname);
mtd->iff = findIfaceFile(pt, mod, type->u.td->fqname, mappedtype_iface, type);
mtd->iff->module = mod;
@@ -2700,17 +2775,17 @@ static void searchMappedTypes(sipSpec *pt,scopedNameDef *snd,argDef *ad)
/* Patch back to defined types so we can use sameBaseType(). */
if (snd != NULL)
{
- oname = ad -> u.snd;
- ad -> u.snd = snd;
- ad -> atype = defined_type;
+ oname = ad->u.snd;
+ ad->u.snd = snd;
+ ad->atype = defined_type;
}
- for (mtd = pt -> mappedtypes; mtd != NULL; mtd = mtd -> next)
- if (sameBaseType(ad,&mtd -> type))
+ for (mtd = pt->mappedtypes; mtd != NULL; mtd = mtd->next)
+ if (sameBaseType(ad, &mtd->type))
{
/* Copy the type. */
- ad -> atype = mapped_type;
- ad -> u.mtd = mtd;
+ ad->atype = mapped_type;
+ ad->u.mtd = mtd;
return;
}
@@ -2718,8 +2793,8 @@ static void searchMappedTypes(sipSpec *pt,scopedNameDef *snd,argDef *ad)
/* Restore because we didn't find anything. */
if (snd != NULL)
{
- ad -> u.snd = oname;
- ad -> atype = no_type;
+ ad->u.snd = oname;
+ ad->atype = no_type;
}
}
@@ -2732,10 +2807,12 @@ void searchTypedefs(sipSpec *pt, scopedNameDef *snd, argDef *ad)
typedefDef *td;
for (td = pt->typedefs; td != NULL; td = td->next)
- if (sameScopedName(td->fqname, snd))
+ {
+ int res = compareScopedNames(td->fqname, snd);
+
+ if (res == 0)
{
/* Copy the type. */
-
ad->atype = td->type.atype;
ad->argflags |= td->type.argflags;
ad->nrderefs += td->type.nrderefs;
@@ -2746,26 +2823,30 @@ void searchTypedefs(sipSpec *pt, scopedNameDef *snd, argDef *ad)
break;
}
+
+ /* The list is sorted so stop if we have gone too far. */
+ if (res > 0)
+ break;
+ }
}
/*
* Search the enums for a name and return the type.
*/
-
-static void searchEnums(sipSpec *pt,scopedNameDef *snd,argDef *ad)
+static void searchEnums(sipSpec *pt, scopedNameDef *snd, argDef *ad)
{
enumDef *ed;
- for (ed = pt -> enums; ed != NULL; ed = ed -> next)
+ for (ed = pt->enums; ed != NULL; ed = ed->next)
{
- if (ed -> fqcname == NULL)
+ if (ed->fqcname == NULL)
continue;
- if (sameScopedName(ed -> fqcname,snd))
+ if (compareScopedNames(ed->fqcname, snd) == 0)
{
- ad -> atype = enum_type;
- ad -> u.ed = ed;
+ ad->atype = enum_type;
+ ad->u.ed = ed;
break;
}
@@ -2776,23 +2857,24 @@ static void searchEnums(sipSpec *pt,scopedNameDef *snd,argDef *ad)
/*
* Search the classes for one with a particular name and return it as a type.
*/
-static void searchClasses(sipSpec *pt, moduleDef *mod, scopedNameDef *cname, argDef *ad)
+static void searchClasses(sipSpec *pt, moduleDef *mod, scopedNameDef *cname,
+ argDef *ad)
{
classDef *cd;
- for (cd = pt -> classes; cd != NULL; cd = cd -> next)
+ for (cd = pt->classes; cd != NULL; cd = cd->next)
{
/*
- * Ignore an external class unless it was declared in the same
- * context (ie. module) as the name is being used.
+ * Ignore an external class unless it was declared in the same context
+ * (ie. module) as the name is being used.
*/
if (isExternal(cd) && cd->iff->module != mod)
continue;
- if (sameScopedName(classFQCName(cd), cname))
+ if (compareScopedNames(classFQCName(cd), cname) == 0)
{
- ad -> atype = class_type;
- ad -> u.cd = cd;
+ ad->atype = class_type;
+ ad->u.cd = cd;
break;
}
@@ -2910,160 +2992,131 @@ static ifaceFileDef *getIfaceFile(argDef *ad)
/*
- * Position a class so that it is after all its super-classes.
+ * Create the sorted array of numbered types for a module.
*/
-static void positionClass(classDef *cd)
+static void createSortedNumberedTypesTable(sipSpec *pt, moduleDef *mod)
{
- classList *cl;
+ classDef *cd;
+ mappedTypeDef *mtd;
+ enumDef *ed;
+ argDef *ad;
+ int i;
- /* See if it has already been done. */
- if (cd -> node -> ordered)
- return;
+ /* Count the how many types there are. */
+ mod->nrtypes = 0;
- for (cl = cd -> supers; cl != NULL; cl = cl -> next)
+ for (cd = pt->classes; cd != NULL; cd = cd->next)
{
- nodeDef **ndp, *nd1, *nd2, *rp;
+ if (cd->iff->module != mod)
+ continue;
+
+ mod->nrtypes++;
+ }
- /* Ignore super-classes from different modules. */
- if (cl -> cd -> iff -> module != cd -> iff -> module)
+ for (mtd = pt->mappedtypes; mtd != NULL; mtd = mtd->next)
+ {
+ if (mtd->iff->module != mod)
continue;
- /* Make sure the super-class is positioned. */
- positionClass(cl -> cd);
+ mod->nrtypes++;
+ }
- /*
- * Find ancestors of the two that are siblings (ie. they have a
- * common parent).
- */
- rp = &cd -> iff -> module -> root;
+ for (ed = pt->enums; ed != NULL; ed = ed->next)
+ {
+ if (ed->fqcname == NULL)
+ continue;
- for (nd1 = cd -> node; nd1 != rp; nd1 = nd1 -> parent)
- {
- for (nd2 = cl -> cd -> node; nd2 != rp; nd2 = nd2 -> parent)
- if (nd1 -> parent == nd2 -> parent)
- break;
+ if (ed->ecd != NULL && isTemplateClass(ed->ecd))
+ continue;
- if (nd2 != rp)
- break;
- }
+ if (ed->module != mod)
+ continue;
- /*
- * The first node must appear after the second in the common
- * parent's list of children.
- */
- for (ndp = &nd1 -> parent -> child; *ndp != NULL; ndp = &(*ndp) -> next)
- {
- nodeDef *nd = *ndp;
+ mod->nrtypes++;
+ }
- if (nd == nd2)
- break;
+ if (mod->nrtypes == 0)
+ return;
- if (nd == nd1)
- {
- /* Remove this one from the list. */
- *ndp = nd -> next;
+ /* Allocate and populate the table. */
+ ad = mod->types = sipCalloc(mod->nrtypes, sizeof (argDef));
- /* Find the super-class ancestor. */
- while (*ndp != nd2)
- ndp = &(*ndp) -> next;
+ for (cd = pt->classes; cd != NULL; cd = cd->next)
+ {
+ if (cd->iff->module != mod)
+ continue;
- /*
- * Put this one back after the super-class
- * ancestor.
- */
- nd -> next = (*ndp) -> next;
- (*ndp) -> next = nd;
+ ad->atype = class_type;
+ ad->u.cd = cd;
+ ad->name = cd->iff->name->text;
- break;
- }
- }
+ ++ad;
}
- cd -> node -> ordered = TRUE;
-}
+ for (mtd = pt->mappedtypes; mtd != NULL; mtd = mtd->next)
+ {
+ if (mtd->iff->module != mod)
+ continue;
+ ad->atype = mapped_type;
+ ad->u.mtd = mtd;
+ ad->name = mtd->cname->text;
-/*
- * Make sure a class is in the namespace tree.
- */
-static void addNodeToParent(nodeDef *root,classDef *cd)
-{
- nodeDef *nd, *parent;
+ ++ad;
+ }
- /* Skip classes already in the tree. */
- if (cd -> node != NULL)
- return;
+ for (ed = pt->enums; ed != NULL; ed = ed->next)
+ {
+ if (ed->fqcname == NULL)
+ continue;
- /* Add this child to the parent. */
- nd = sipMalloc(sizeof (nodeDef));
+ if (ed->ecd != NULL && isTemplateClass(ed->ecd))
+ continue;
- nd -> ordered = FALSE;
- nd -> cd = cd;
- nd -> child = NULL;
+ if (ed->module != mod)
+ continue;
- /* Get the address of the parent node. */
- if (cd -> ecd == NULL)
- parent = root;
- else
- {
- /* Make sure the parent is in the tree. */
- addNodeToParent(root,cd -> ecd);
+ ad->atype = enum_type;
+ ad->u.ed = ed;
+ ad->name = ed->cname->text;
- parent = cd -> ecd -> node;
+ ++ad;
}
- nd -> parent = parent;
+ /* Sort the table and assign type numbers. */
+ qsort(mod->types, mod->nrtypes, sizeof (argDef), compareTypes);
- /* Insert this at the head of the parent's children. */
- nd -> next = parent -> child;
- parent -> child = nd;
-
- /* Remember where we are in the tree. */
- cd -> node = nd;
-}
+ for (ad = mod->types, i = 0; i < mod->nrtypes; ++i, ++ad)
+ {
+ switch (ad->atype)
+ {
+ case class_type:
+ ad->u.cd->classnr = i;
+ /* If we find a class called QObject, assume it's Qt. */
+ if (strcmp(ad->name, "QObject") == 0)
+ mod->qobjclass = i;
-/*
- * Assign the module specific class number for a class and all it's children.
- */
-static void assignClassNrs(sipSpec *pt, moduleDef *mod, nodeDef *nd)
-{
- classDef *cd;
- nodeDef *cnd;
+ break;
- /* Assign the class if it's not the root. */
- if ((cd = nd->cd) != NULL)
- {
- cd->classnr = mod->nrclasses++;
+ case mapped_type:
+ ad->u.mtd->mappednr = i;
+ break;
- /* If we find a class called QObject, assume it's Qt. */
- if (strcmp(classBaseName(cd), "QObject") == 0)
- mod->qobjclass = cd->classnr;
+ case enum_type:
+ ad->u.ed->enumnr = i;
+ break;
+ }
}
-
- /* Assign all it's children. */
- for (cnd = nd->child; cnd != NULL; cnd = cnd->next)
- assignClassNrs(pt, mod, cnd);
}
/*
- * Assign the module specific enum number for all named enums.
+ * The qsort helper to compare two generated type names.
*/
-static void assignEnumNrs(sipSpec *pt)
+static int compareTypes(const void *t1, const void *t2)
{
- enumDef *ed;
-
- for (ed = pt->enums; ed != NULL; ed = ed->next)
- {
- if (ed->fqcname == NULL)
- continue;
-
- if (ed->ecd != NULL && isTemplateClass(ed->ecd))
- continue;
-
- ed->enumnr = ed->module->nrenums++;
- }
+ return strcmp(((argDef *)t1)->name, ((argDef *)t2)->name);
}
sipgen/transform.c
@@ -1,6 +1,6 @@
// This contains all the C++ code that is needed by the sip module.
//
-// Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
+// Copyright (c) 2009 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of SIP.
//
siplib/bool.cpp
@@ -2,7 +2,7 @@
* This module implements a hash table class for mapping C/C++ addresses to the
* corresponding wrapped Python object.
*
- * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
+ * Copyright (c) 2009 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -100,13 +100,15 @@ static sipHashEntry *findHashEntry(sipObjectMap *om,void *key)
* Return the wrapped Python object of a specific type for a C/C++ address or
* NULL if it wasn't found.
*/
-sipWrapper *sipOMFindObject(sipObjectMap *om, void *key, sipWrapperType *type)
+sipSimpleWrapper *sipOMFindObject(sipObjectMap *om, void *key,
+ const sipTypeDef *td)
{
sipHashEntry *he = findHashEntry(om, key);
- sipWrapper *w;
+ sipSimpleWrapper *sw;
+ PyTypeObject *py_type = sipTypeAsPyTypeObject(td);
/* Go through each wrapped object at this address. */
- for (w = he->first; w != NULL; w = w->next)
+ for (sw = he->first; sw != NULL; sw = sw->next)
{
/*
* If the reference count is 0 then it is in the process of being
@@ -115,15 +117,15 @@ sipWrapper *sipOMFindObject(sipObjectMap *om, void *key, sipWrapperType *type)
* code is being re-entered (and there are guards in place to prevent
* this).
*/
- if (w->ob_refcnt == 0)
+ if (sw->ob_refcnt == 0)
continue;
/*
* If this wrapped object is of the given type, or a sub-type of it,
* then we assume it is the same C++ object.
*/
- if (PyObject_TypeCheck(w, (PyTypeObject *)type))
- return w;
+ if (PyObject_TypeCheck(sw, py_type))
+ return sw;
}
return NULL;
@@ -133,9 +135,9 @@ sipWrapper *sipOMFindObject(sipObjectMap *om, void *key, sipWrapperType *type)
/*
* Add a C/C++ address and the corresponding wrapped Python object to the map.
*/
-void sipOMAddObject(sipObjectMap *om,sipWrapper *val)
+void sipOMAddObject(sipObjectMap *om, sipSimpleWrapper *val)
{
- sipHashEntry *he = findHashEntry(om,val -> u.cppPtr);
+ sipHashEntry *he = findHashEntry(om, val->u.cppPtr);
/*
* If the bucket is in use then we appear to have several objects at the
@@ -158,42 +160,42 @@ void sipOMAddObject(sipObjectMap *om,sipWrapper *val)
* pointers as invalid and reuse the entry. Otherwise we just add this
* one to the existing list of objects at this address.
*/
- if (!(val -> flags & SIP_SHARE_MAP))
+ if (!(val->flags & SIP_SHARE_MAP))
{
- sipWrapper *w = he->first;
+ sipSimpleWrapper *sw = he->first;
he->first = NULL;
- while (w != NULL)
+ while (sw != NULL)
{
- sipWrapper *next = w->next;
+ sipSimpleWrapper *next = sw->next;
/* We are removing it from the map here. */
- sipSetNotInMap(w);
- sip_api_common_dtor(w);
+ sipSetNotInMap(sw);
+ sip_api_common_dtor(sw);
- w = next;
+ sw = next;
}
}
- val -> next = he -> first;
- he -> first = val;
+ val->next = he->first;
+ he->first = val;
return;
}
/* See if the bucket was unused or stale. */
- if (he -> key == NULL)
+ if (he->key == NULL)
{
- he -> key = val -> u.cppPtr;
- om -> unused--;
+ he->key = val -> u.cppPtr;
+ om->unused--;
}
else
- om -> stale--;
+ om->stale--;
/* Add the rest of the new value. */
- he -> first = val;
- val -> next = NULL;
+ he->first = val;
+ val->next = NULL;
reorganiseMap(om);
}
@@ -248,15 +250,15 @@ static void reorganiseMap(sipObjectMap *om)
* Remove a C/C++ object from the table. Return 0 if it was removed
* successfully.
*/
-int sipOMRemoveObject(sipObjectMap *om,sipWrapper *val)
+int sipOMRemoveObject(sipObjectMap *om, sipSimpleWrapper *val)
{
- sipHashEntry *he = findHashEntry(om,val -> u.cppPtr);
- sipWrapper **wp;
+ sipHashEntry *he = findHashEntry(om, val->u.cppPtr);
+ sipSimpleWrapper **swp;
- for (wp = &he -> first; *wp != NULL; wp = &(*wp) -> next)
- if (*wp == val)
+ for (swp = &he->first; *swp != NULL; swp = &(*swp)->next)
+ if (*swp == val)
{
- *wp = val -> next;
+ *swp = val->next;
/*
* If the bucket is now empty then count it as stale. Note that we
@@ -266,8 +268,8 @@ int sipOMRemoveObject(sipObjectMap *om,sipWrapper *val)
* words, searches must be repeatable until we reorganise the
* table.
*/
- if (he -> first == NULL)
- om -> stale++;
+ if (he->first == NULL)
+ om->stale++;
return 0;
}
siplib/objmap.c
@@ -2,7 +2,7 @@
* The SIP library code that implements the interface to the optional module
* supplied Qt support.
*
- * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
+ * Copyright (c) 2009 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -15,6 +15,7 @@
#include <Python.h>
+#include <assert.h>
#include <string.h>
#include "sip.h"
@@ -22,357 +23,16 @@
/* This is how Qt "types" signals and slots. */
-#define isQtSlot(s) (*(s) == '1')
+#define isQtSlot(s) (*(s) == '1')
#define isQtSignal(s) (*(s) == '2')
-static PyObject *py_sender = NULL; /* The last Python signal sender. */
-
-
-static int isSameSlot(sipSlot *,PyObject *,const char *);
-static int emitQtSig(sipWrapper *,const char *,PyObject *);
-static int emitToSlotList(sipSlotList *rxlist, PyObject *sigargs);
-static int addSlotToPySigList(sipWrapper *,const char *,PyObject *,const char *);
-static void removeSlotFromPySigList(sipWrapper *,const char *,PyObject *,const char *);
static PyObject *getWeakRef(PyObject *obj);
-static sipPySig *findPySignal(sipWrapper *,const char *);
static char *sipStrdup(const char *);
-static int saveSlot(sipSlot *sp, PyObject *rxObj, const char *slot);
static void *createUniversalSlot(sipWrapper *txSelf, const char *sig,
PyObject *rxObj, const char *slot, const char **member, int flags);
static void *findSignal(void *txrx, const char **sig);
static void *newSignal(void *txrx, const char **sig);
-static void freeSlot(sipSlot *slot);
-
-
-/*
- * Return the most recent signal sender.
- */
-PyObject *sip_api_get_sender()
-{
- PyObject *sender;
- const void *qt_sender;
-
- /*
- * If there is a Qt sender then it is more recent than the last Python
- * sender, so use it instead.
- */
- if ((qt_sender = sipQtSupport->qt_get_sender()) != NULL)
- sender = sip_api_convert_from_instance((void *)qt_sender, sipQObjectClass, NULL);
- else
- {
- if ((sender = py_sender) == NULL)
- sender = Py_None;
-
- Py_INCREF(sender);
- }
-
- return sender;
-}
-
-
-/*
- * Release the resources held by a connection.
- */
-void sip_api_free_connection(sipSlotConnection *conn)
-{
- freeSlot(&conn->sc_slot);
-}
-
-
-/*
- * Compare two connections and return TRUE if they are the same.
- */
-int sip_api_same_connection(sipSlotConnection *conn, void *tx, const char *sig,
- PyObject *rxObj, const char *slot)
-{
- return (conn->sc_transmitter == tx &&
- sipQtSupport->qt_same_name(conn->sc_signature->sg_signature, sig) &&
- isSameSlot(&conn->sc_slot, rxObj, slot));
-}
-
-
-/*
- * Parse the signal arguments for a connection.
- */
-sipSignature *sip_api_parse_signature(const char *sig)
-{
- static sipSignature *psig_list = NULL;
- sipSignature *psig;
- const char *sp, *ep;
-
- /*
- * First see if it has already been parsed. Note that both sides of a
- * connection will probably be parsed twice because the function names will
- * be different even though the signatures will probably be the same. We
- * could be more clever, the most saving is when repeatedly emitting a
- * signal for which this is sufficient.
- */
- for (psig = psig_list; psig != NULL; psig = psig->sg_next)
- if (sipQtSupport->qt_same_name(psig->sg_signature, sig))
- return psig;
-
- /* Create a new one including space for the copy of the signature. */
- if ((psig = (sipSignature *)sip_api_malloc(sizeof (sipSignature) + strlen(sig) + 1)) == NULL)
- return NULL;
-
- psig->sg_signature = (char *)&psig[1];
- psig->sg_nrargs = 0;
- psig->sg_args = 0;
-
- /* Find the start and end of the arguments. */
- sp = strchr(sig, '(');
- ep = strrchr(sig, ')');
-
- /* If the signal isn't well formed we assume Qt will pick it up. */
- if (sp && ep && sp < ep)
- {
- /*
- * Copy the signature arguments while counting them and
- * removing non-significant spaces. Each argument is left as a
- * '\0' terminated string.
- */
- char *dp = psig->sg_signature;
- int depth = 0, nrcommas = 0, argstart = TRUE;
-
- for (;;)
- {
- char ch = *++sp;
-
- if (strchr(",*&)<>", ch))
- {
- /* Backup over any previous trailing space. */
- if (dp > psig->sg_signature && dp[-1] == ' ')
- --dp;
-
- if (sp == ep)
- {
- *dp = '\0';
- break;
- }
-
- if (ch == ',' && depth == 0)
- {
- *dp++ = '\0';
- ++nrcommas;
- argstart = TRUE;
- }
- else
- {
- *dp++ = ch;
-
- /*
- * Make sure commas in template
- * arguments are ignored.
- */
- if (ch == '<')
- ++depth;
- else if (ch == '>')
- --depth;
- }
- }
- else if (ch == ' ')
- {
- /* Ignore leading and multiple spaces. */
- if (!argstart && dp[-1] != ' ')
- *dp++ = ch;
- }
- else
- {
- *dp++ = ch;
- argstart = FALSE;
- }
- }
-
- /* Handle the arguments now they are in a normal form. */
- if (*psig->sg_signature)
- {
- char *arg = psig->sg_signature;
- int a;
-
- /* Allocate the space. */
- psig->sg_nrargs = nrcommas + 1;
-
- if ((psig->sg_args = (sipSigArg *)sip_api_malloc(sizeof (sipSigArg) * psig->sg_nrargs)) == NULL)
- {
- sip_api_free(psig);
- return NULL;
- }
-
- for (a = 0; a < psig->sg_nrargs; ++a)
- {
- sip_api_parse_type(arg, &psig->sg_args[a]);
-
- /* Move to the start of the next argument. */
- arg += strlen(arg) + 1;
- }
- }
- }
-
- /* Make a deep copy of the signal. */
- strcpy(psig->sg_signature, sig);
-
- /* Add it to the list so it can be re-used. */
- psig->sg_next = psig_list;
- psig_list = psig;
-
- return psig;
-}
-
-
-/*
- * Parse a single type.
- */
-void sip_api_parse_type(const char *type, sipSigArg *arg)
-{
- size_t btlen = 0;
- int unsup, isref = FALSE, indir = 0;
- const char *ep;
- sipSigArgType sat = unknown_sat;
-
- /* Find the start of the significant part of the type. */
- if (strncmp(type, "const ", 6) == 0)
- type += 6;
-
- /*
- * Find the length of the base type, the number of indirections and if it
- * is a reference.
- */
- for (ep = type; *ep; ++ep)
- if (*ep == '&')
- isref = TRUE;
- else if (*ep == '*')
- ++indir;
- else
- ++btlen;
-
- /* Assume that anything other than a base type is unsupported. */
- unsup = (isref || indir);
-
- /* Parse the base type. */
- switch (btlen)
- {
- case 3:
- if (strncmp(type, "int", 3) == 0)
- sat = int_sat;
- break;
-
- case 4:
- if (strncmp(type, "bool", 4) == 0)
- sat = bool_sat;
- else if (strncmp(type, "long", 4) == 0)
- sat = long_sat;
- else if (strncmp(type, "char", 4) == 0)
- {
- sat = (indir ? string_sat : char_sat);
- unsup = (isref || indir > 1);
- }
- else if (strncmp(type, "void", 4) == 0)
- {
- sat = void_sat;
- unsup = (isref || indir != 1);
- }
- break;
-
- case 5:
- if (strncmp(type, "float", 5) == 0)
- sat = float_sat;
- else if (strncmp(type, "short", 5) == 0)
- sat = short_sat;
- break;
-
- case 6:
- if (strncmp(type, "double", 6) == 0)
- sat = double_sat;
- break;
-
- case 7:
- if (strncmp(type, "__int64", 7) == 0)
- sat = longlong_sat;
- else if (strncmp(type, "wchar_t", 7) == 0)
- {
- sat = (indir ? wstring_sat : wchar_sat);
- unsup = (isref || indir > 1);
- }
- break;
-
- case 8:
- if (strncmp(type, "unsigned", 8) == 0)
- sat = uint_sat;
- else if (strncmp(type, "QVariant", 8) == 0)
- {
- if (indir == 0)
- {
- sat = qvariant_sat;
- unsup = FALSE;
- }
- else if (indir == 1)
- {
- sat = qvariantp_sat;
- unsup = FALSE;
- }
- }
- break;
-
- case 9:
- if (strncmp(type, "long long", 9) == 0)
- sat = longlong_sat;
- break;
-
- case 11:
- if (strncmp(type, "signed char", 11) == 0)
- {
- sat = (indir ? sstring_sat : schar_sat);
- unsup = (isref || indir > 1);
- }
- break;
-
- case 12:
- if (strncmp(type, "unsigned int", 12) == 0)
- sat = uint_sat;
- break;
-
- case 13:
- if (strncmp(type, "unsigned long", 13) == 0)
- sat = ulong_sat;
- else if (strncmp(type, "unsigned char", 13) == 0)
- {
- sat = (indir ? ustring_sat : uchar_sat);
- unsup = (isref || indir > 1);
- }
- else if (strncmp(type, "PyQt_PyObject", 13) == 0 && indir == 0)
- {
- sat = pyobject_sat;
- unsup = FALSE;
- }
- break;
-
- case 14:
- if (strncmp(type, "unsigned short", 14) == 0)
- sat = ushort_sat;
- break;
-
- case 16:
- if (strncmp(type, "unsigned __int64", 16) == 0)
- sat = ulonglong_sat;
- break;
-
- case 18:
- if (strncmp(type, "unsigned long long", 18) == 0)
- sat = ulonglong_sat;
- break;
- }
-
- if (sat == unknown_sat)
- sipFindSigArgType(type, btlen, arg, indir);
- else
- {
- if (unsup)
- sat = unknown_sat;
-
- arg->atype = sat;
- }
-}
/*
@@ -380,28 +40,10 @@ void sip_api_parse_type(const char *type, sipSigArg *arg)
*/
static void *findSignal(void *txrx, const char **sig)
{
- sipSignature *psig;
-
- /*
- * Handle the trivial case where the Qt implementation doesn't support
- * universal signals.
- */
- if (sipQtSupport->qt_is_qt_signal == NULL)
- return txrx;
-
- /* See if this a shortcircuited Python signal. */
- if (strchr(*sig, '(') == NULL)
- return sipQtSupport->qt_find_universal_signal_shortcut(txrx, *sig, sig);
-
- /* See if the existing object can be used itself. */
- if (sipQtSupport->qt_is_qt_signal(txrx, *sig))
- return txrx;
-
- if ((psig = sip_api_parse_signature(*sig)) == NULL)
- return NULL;
+ if (sipQtSupport->qt_find_universal_signal != NULL)
+ txrx = sipQtSupport->qt_find_universal_signal(txrx, sig);
- /* Find an ordinary universal signal. */
- return sipQtSupport->qt_find_universal_signal(txrx, psig);
+ return txrx;
}
@@ -410,28 +52,12 @@ static void *findSignal(void *txrx, const char **sig)
*/
static void *newSignal(void *txrx, const char **sig)
{
- sipSignature *psig;
+ void *new_txrx = findSignal(txrx, sig);
- /*
- * Handle the trivial case where the Qt implementation doesn't support
- * universal signals.
- */
- if (sipQtSupport->qt_is_qt_signal == NULL)
- return txrx;
-
- /* See if this a shortcircuited Python signal. */
- if (strchr(*sig, '(') == NULL)
- return sipQtSupport->qt_create_universal_signal_shortcut(txrx, *sig, sig);
-
- /* See if the existing object can be used itself. */
- if (sipQtSupport->qt_is_qt_signal(txrx, *sig))
- return txrx;
+ if (new_txrx == NULL && sipQtSupport->qt_create_universal_signal != NULL)
+ new_txrx = sipQtSupport->qt_create_universal_signal(txrx, sig);
- if ((psig = sip_api_parse_signature(*sig)) == NULL)
- return NULL;
-
- /* Create an ordinary universal signal. */
- return sipQtSupport->qt_create_universal_signal(txrx, psig);
+ return new_txrx;
}
@@ -440,178 +66,19 @@ static void *newSignal(void *txrx, const char **sig)
* error.
*/
static void *createUniversalSlot(sipWrapper *txSelf, const char *sig,
- PyObject *rxObj, const char *slot,
- const char **member, int flags)
+ PyObject *rxObj, const char *slot, const char **member, int flags)
{
- sipSlotConnection conn;
- void *us;
+ void *us = sipQtSupport->qt_create_universal_slot(txSelf, sig, rxObj, slot,
+ member, flags);
- /* Initialise the connection. */
- conn.sc_transmitter = (txSelf ? sipGetAddress(txSelf) : 0);
-
- /* Save the real slot. */
- if (saveSlot(&conn.sc_slot, rxObj, slot) < 0)
- return 0;
-
- /* Parse the signature and create the universal slot. */
- if ((conn.sc_signature = sip_api_parse_signature(sig)) == NULL)
- {
- sip_api_free_connection(&conn);
- return 0;
- }
-
- /*
- * Use the new API only if it is needed. This ensures binary
- * compatibility.
- */
- if (flags)
- us = sipQtSupport->qt_create_universal_slot_ex(txSelf, &conn, member,
- flags);
- else
- us = sipQtSupport->qt_create_universal_slot(txSelf, &conn, member);
-
- if (us == NULL)
- {
- sip_api_free_connection(&conn);
- return 0;
- }
-
- if (txSelf)
- sipSetPossibleProxy(txSelf);
+ if (us && txSelf)
+ sipSetPossibleProxy((sipSimpleWrapper *)txSelf);
return us;
}
/*
- * Emit a Python or Qt signal.
- */
-int sip_api_emit_signal(PyObject *self,const char *sig,PyObject *sigargs)
-{
- sipPySig *ps;
- void *tx;
- sipWrapper *w = (sipWrapper *)self;
-
- /*
- * Don't do anything if signals are blocked. Qt signals would be blocked
- * anyway, but this blocks Python signals as well.
- */
- if ((tx = sip_api_get_cpp_ptr(w, sipQObjectClass)) == NULL || sipQtSupport->qt_signals_blocked(tx))
- return 0;
-
- if (isQtSignal(sig))
- {
- sipSignature *psig;
-
- /* Handle Qt implementations that emit using generated code. */
- if (!sipQtSupport->qt_emit_signal)
- return emitQtSig(w, sig, sigargs);
-
- /* See if the signal is a shortcut. */
- if (strchr(sig, '(') == NULL)
- return sipQtSupport->qt_emit_signal_shortcut(tx, sig, sigargs);
-
- if ((psig = sip_api_parse_signature(sig)) == NULL)
- return -1;
-
- if (psig->sg_nrargs != PyTuple_GET_SIZE(sigargs))
- PyErr_Format(PyExc_TypeError, "Signal has %d arguments, but %d given", psig->sg_nrargs, PyTuple_GET_SIZE(sigargs));
-
- return sipQtSupport->qt_emit_signal(tx, psig, sigargs);
- }
-
- if ((ps = findPySignal(w,sig)) != NULL)
- {
- int rc;
-
- /* Forget the last Qt sender and remember this one. */
- sipQtSupport->qt_forget_sender();
- py_sender = self;
-
- rc = emitToSlotList(ps -> rxlist,sigargs);
-
- /* Forget this as a sender. */
- py_sender = NULL;
-
- return rc;
- }
-
- return 0;
-}
-
-
-/*
- * Search the Python signal list for a signal.
- */
-static sipPySig *findPySignal(sipWrapper *w,const char *sig)
-{
- sipPySig *ps;
-
- for (ps = w -> pySigList; ps != NULL; ps = ps -> next)
- if (sipQtSupport->qt_same_name(ps -> name,sig))
- return ps;
-
- return NULL;
-}
-
-
-/*
- * Search a signal table for a signal. If found, call the emitter function
- * with the signal arguments. Return 0 if the signal was emitted or <0 if
- * there was an error.
- */
-static int emitQtSig(sipWrapper *w,const char *sig,PyObject *sigargs)
-{
- sipQtSignal *tab;
-
- /* Search the table. */
- for (tab = ((sipWrapperType *)(w -> ob_type)) -> type -> td_emit; tab -> st_name != NULL; ++tab)
- {
- const char *sp, *tp;
- int found;
-
- /* Compare only the base name. */
- sp = &sig[1];
- tp = tab -> st_name;
-
- found = TRUE;
-
- while (*sp != '\0' && *sp != '(' && *tp != '\0')
- if (*sp++ != *tp++)
- {
- found = FALSE;
- break;
- }
-
- if (found)
- return (*tab -> st_emitfunc)(w,sigargs);
- }
-
- /* It wasn't found if we got this far. */
- PyErr_Format(PyExc_NameError,"Invalid signal %s",&sig[1]);
-
- return -1;
-}
-
-
-/*
- * Send a signal to a single slot (Qt or Python). This is deprecated.
- */
-int sip_api_emit_to_slot(const sipSlot *slot, PyObject *sigargs)
-{
- PyObject *obj = sip_api_invoke_slot(slot, sigargs);
-
- if (obj != NULL)
- {
- Py_DECREF(obj);
- return 0;
- }
-
- return -1;
-}
-
-
-/*
* Invoke a single slot (Qt or Python) and return the result.
*/
PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs)
@@ -621,10 +88,12 @@ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs)
/* Keep some compilers quiet. */
oxtype = oxvalue = oxtb = NULL;
- /* Fan out Qt signals. */
+ /* Fan out Qt signals. (Only PyQt3 will do this.) */
if (slot->name != NULL && slot->name[0] != '\0')
{
- if (sip_api_emit_signal(slot->pyobj, slot->name, sigargs) < 0)
+ assert(sipQtSupport->qt_signal_relay);
+
+ if (sipQtSupport->qt_signal_relay(slot->pyobj, slot->name, sigargs) < 0)
return NULL;
Py_INCREF(Py_None);
@@ -816,124 +285,50 @@ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs)
/*
- * Send a signal to the slots (Qt or Python) in a Python list.
- */
-static int emitToSlotList(sipSlotList *rxlist,PyObject *sigargs)
-{
- int rc;
-
- /* Apply the arguments to each slot method. */
- rc = 0;
-
- while (rxlist != NULL && rc >= 0)
- {
- sipSlotList *next;
-
- /*
- * We get the next in the list before calling the slot in case the list
- * gets changed by the slot - usually because the slot disconnects
- * itself.
- */
- next = rxlist -> next;
- rc = sip_api_emit_to_slot(&rxlist -> rx, sigargs);
- rxlist = next;
- }
-
- return rc;
-}
-
-
-/*
- * Add a slot to a transmitter's Python signal list. The signal is a Python
- * signal, the slot may be either a Qt signal, a Qt slot, a Python signal or a
- * Python slot.
- */
-static int addSlotToPySigList(sipWrapper *txSelf,const char *sig,
- PyObject *rxObj,const char *slot)
-{
- sipPySig *ps;
- sipSlotList *psrx;
-
- /* Create a new one if necessary. */
- if ((ps = findPySignal(txSelf,sig)) == NULL)
- {
- if ((ps = (sipPySig *)sip_api_malloc(sizeof (sipPySig))) == NULL)
- return -1;
-
- if ((ps -> name = sipStrdup(sig)) == NULL)
- {
- sip_api_free(ps);
- return -1;
- }
-
- ps -> rxlist = NULL;
- ps -> next = txSelf -> pySigList;
-
- txSelf -> pySigList = ps;
- }
-
- /* Create the new receiver. */
- if ((psrx = (sipSlotList *)sip_api_malloc(sizeof (sipSlotList))) == NULL)
- return -1;
-
- if (saveSlot(&psrx->rx, rxObj, slot) < 0)
- {
- sip_api_free(psrx);
- return -1;
- }
-
- psrx -> next = ps -> rxlist;
- ps -> rxlist = psrx;
-
- return 0;
-}
-
-
-/*
* Compare two slots to see if they are the same.
*/
-static int isSameSlot(sipSlot *slot1, PyObject *rxobj2, const char *slot2)
+int sip_api_same_slot(const sipSlot *sp, PyObject *rxObj, const char *slot)
{
/* See if they are signals or Qt slots, ie. they have a name. */
- if (slot2 != NULL)
+ if (slot != NULL)
{
- if (slot1->name == NULL || slot1->name[0] == '\0')
+ if (sp->name == NULL || sp->name[0] == '\0')
return 0;
- return (sipQtSupport->qt_same_name(slot1->name, slot2) && slot1->pyobj == rxobj2);
+ return (sipQtSupport->qt_same_name(sp->name, slot) && sp->pyobj == rxObj);
}
/* See if they are pure Python methods. */
- if (PyMethod_Check(rxobj2))
+ if (PyMethod_Check(rxObj))
{
- if (slot1->pyobj != NULL)
+ if (sp->pyobj != NULL)
return 0;
- return (slot1->meth.mfunc == PyMethod_GET_FUNCTION(rxobj2) &&
- slot1->meth.mself == PyMethod_GET_SELF(rxobj2) &&
- slot1->meth.mclass == PyMethod_GET_CLASS(rxobj2));
+ return (sp->meth.mfunc == PyMethod_GET_FUNCTION(rxObj) &&
+ sp->meth.mself == PyMethod_GET_SELF(rxObj) &&
+ sp->meth.mclass == PyMethod_GET_CLASS(rxObj));
}
/* See if they are wrapped C++ methods. */
- if (PyCFunction_Check(rxobj2))
+ if (PyCFunction_Check(rxObj))
{
- if (slot1->name == NULL || slot1->name[0] != '\0')
+ if (sp->name == NULL || sp->name[0] != '\0')
return 0;
- return (slot1->pyobj == PyCFunction_GET_SELF(rxobj2) &&
- strcmp(&slot1->name[1], ((PyCFunctionObject *)rxobj2)->m_ml->ml_name) == 0);
+ return (sp->pyobj == PyCFunction_GET_SELF(rxObj) &&
+ strcmp(&sp->name[1], ((PyCFunctionObject *)rxObj)->m_ml->ml_name) == 0);
}
/* The objects must be the same. */
- return (slot1->pyobj == rxobj2);
+ return (sp->pyobj == rxObj);
}
/*
* Convert a valid Python signal or slot to an existing universal slot.
*/
-void *sipGetRx(sipWrapper *txSelf,const char *sigargs,PyObject *rxObj,
- const char *slot,const char **memberp)
+void *sipGetRx(sipSimpleWrapper *txSelf, const char *sigargs, PyObject *rxObj,
+ const char *slot, const char **memberp)
{
if (slot != NULL)
if (isQtSlot(slot) || isQtSignal(slot))
@@ -942,7 +337,7 @@ void *sipGetRx(sipWrapper *txSelf,const char *sigargs,PyObject *rxObj,
*memberp = slot;
- if ((rx = sip_api_get_cpp_ptr((sipWrapper *)rxObj, sipQObjectClass)) == NULL)
+ if ((rx = sip_api_get_cpp_ptr((sipSimpleWrapper *)rxObj, sipQObjectType)) == NULL)
return NULL;
if (isQtSignal(slot))
@@ -964,11 +359,11 @@ void *sipGetRx(sipWrapper *txSelf,const char *sigargs,PyObject *rxObj,
* slot) to a Qt receiver. It is only ever called when the signal is a Qt
* signal. Return NULL is there was an error.
*/
-void *sipConvertRxEx(sipWrapper *txSelf,const char *sig,PyObject *rxObj,
- const char *slot,const char **memberp, int flags)
+void *sip_api_convert_rx(sipWrapper *txSelf, const char *sigargs,
+ PyObject *rxObj, const char *slot, const char **memberp, int flags)
{
if (slot == NULL)
- return createUniversalSlot(txSelf, sig, rxObj, NULL, memberp, flags);
+ return createUniversalSlot(txSelf, sigargs, rxObj, NULL, memberp, flags);
if (isQtSlot(slot) || isQtSignal(slot))
{
@@ -976,7 +371,7 @@ void *sipConvertRxEx(sipWrapper *txSelf,const char *sig,PyObject *rxObj,
*memberp = slot;
- if ((rx = sip_api_get_cpp_ptr((sipWrapper *)rxObj, sipQObjectClass)) == NULL)
+ if ((rx = sip_api_get_cpp_ptr((sipSimpleWrapper *)rxObj, sipQObjectType)) == NULL)
return NULL;
if (isQtSignal(slot))
@@ -986,7 +381,7 @@ void *sipConvertRxEx(sipWrapper *txSelf,const char *sig,PyObject *rxObj,
}
/* The slot is a Python signal so we need a universal slot to catch it. */
- return createUniversalSlot(txSelf, sig, rxObj, slot, memberp, 0);
+ return createUniversalSlot(txSelf, sigargs, rxObj, slot, memberp, 0);
}
@@ -994,11 +389,9 @@ void *sipConvertRxEx(sipWrapper *txSelf,const char *sig,PyObject *rxObj,
* Connect a Qt signal or a Python signal to a Qt slot, a Qt signal, a Python
* slot or a Python signal. This is all possible combinations.
*/
-PyObject *sip_api_connect_rx(PyObject *txObj,const char *sig,PyObject *rxObj,
- const char *slot, int type)
+PyObject *sip_api_connect_rx(PyObject *txObj, const char *sig, PyObject *rxObj,
+ const char *slot, int type)
{
- sipWrapper *txSelf = (sipWrapper *)txObj;
-
/* Handle Qt signals. */
if (isQtSignal(sig))
{
@@ -1006,7 +399,7 @@ PyObject *sip_api_connect_rx(PyObject *txObj,const char *sig,PyObject *rxObj,
const char *member, *real_sig;
int res;
- if ((tx = sip_api_get_cpp_ptr(txSelf, sipQObjectClass)) == NULL)
+ if ((tx = sip_api_get_cpp_ptr((sipSimpleWrapper *)txObj, sipQObjectType)) == NULL)
return NULL;
real_sig = sig;
@@ -1014,7 +407,7 @@ PyObject *sip_api_connect_rx(PyObject *txObj,const char *sig,PyObject *rxObj,
if ((tx = newSignal(tx, &real_sig)) == NULL)
return NULL;
- if ((rx = sipConvertRxEx(txSelf, sig, rxObj, slot, &member, 0)) == NULL)
+ if ((rx = sip_api_convert_rx((sipWrapper *)txObj, sig, rxObj, slot, &member, 0)) == NULL)
return NULL;
res = sipQtSupport->qt_connect(tx, real_sig, rx, member, type);
@@ -1022,8 +415,10 @@ PyObject *sip_api_connect_rx(PyObject *txObj,const char *sig,PyObject *rxObj,
return PyBool_FromLong(res);
}
- /* Handle Python signals. */
- if (addSlotToPySigList(txSelf, sig, rxObj, slot) < 0)
+ /* Handle Python signals. Only PyQt3 will get this far. */
+ assert(sipQtSupport->qt_connect_py_signal);
+
+ if (sipQtSupport->qt_connect_py_signal(txObj, sig, rxObj, slot) < 0)
return NULL;
Py_INCREF(Py_True);
@@ -1037,16 +432,15 @@ PyObject *sip_api_connect_rx(PyObject *txObj,const char *sig,PyObject *rxObj,
PyObject *sip_api_disconnect_rx(PyObject *txObj,const char *sig,
PyObject *rxObj,const char *slot)
{
- sipWrapper *txSelf = (sipWrapper *)txObj;
-
/* Handle Qt signals. */
if (isQtSignal(sig))
{
+ sipSimpleWrapper *txSelf = (sipSimpleWrapper *)txObj;
void *tx, *rx;
const char *member;
int res;
- if ((tx = sip_api_get_cpp_ptr(txSelf, sipQObjectClass)) == NULL)
+ if ((tx = sip_api_get_cpp_ptr(txSelf, sipQObjectType)) == NULL)
return NULL;
if ((rx = sipGetRx(txSelf, sig, rxObj, slot, &member)) == NULL)
@@ -1070,8 +464,10 @@ PyObject *sip_api_disconnect_rx(PyObject *txObj,const char *sig,
return PyBool_FromLong(res);
}
- /* Handle Python signals. */
- removeSlotFromPySigList(txSelf,sig,rxObj,slot);
+ /* Handle Python signals. Only PyQt3 will get this far. */
+ assert(sipQtSupport->qt_disconnect_py_signal);
+
+ sipQtSupport->qt_disconnect_py_signal(txObj, sig, rxObj, slot);
Py_INCREF(Py_True);
return Py_True;
@@ -1079,36 +475,9 @@ PyObject *sip_api_disconnect_rx(PyObject *txObj,const char *sig,
/*
- * Remove a slot from a transmitter's Python signal list.
- */
-static void removeSlotFromPySigList(sipWrapper *txSelf,const char *sig,
- PyObject *rxObj,const char *slot)
-{
- sipPySig *ps;
-
- if ((ps = findPySignal(txSelf,sig)) != NULL)
- {
- sipSlotList **psrxp;
-
- for (psrxp = &ps -> rxlist; *psrxp != NULL; psrxp = &(*psrxp) -> next)
- {
- sipSlotList *psrx = *psrxp;
-
- if (isSameSlot(&psrx -> rx,rxObj,slot))
- {
- *psrxp = psrx -> next;
- sipFreeSlotList(psrx);
- break;
- }
- }
- }
-}
-
-
-/*
- * Free a sipSlot structure.
+ * Free the resources of a slot.
*/
-static void freeSlot(sipSlot *slot)
+void sip_api_free_sipslot(sipSlot *slot)
{
if (slot->name != NULL)
sip_api_free(slot->name);
@@ -1121,16 +490,6 @@ static void freeSlot(sipSlot *slot)
/*
- * Free a sipSlotList structure on the heap.
- */
-void sipFreeSlotList(sipSlotList *rx)
-{
- freeSlot(&rx->rx);
- sip_api_free(rx);
-}
-
-
-/*
* Implement strdup() using sip_api_malloc().
*/
static char *sipStrdup(const char *s)
@@ -1149,7 +508,7 @@ static char *sipStrdup(const char *s)
* Qt signal, then the slot may be a Python signal or a Python slot. If the
* signal was a Python signal, then the slot may be anything.
*/
-static int saveSlot(sipSlot *sp, PyObject *rxObj, const char *slot)
+int sip_api_save_slot(sipSlot *sp, PyObject *rxObj, const char *slot)
{
sp -> weakSlot = NULL;
@@ -1185,7 +544,7 @@ static int saveSlot(sipSlot *sp, PyObject *rxObj, const char *slot)
if (PyCFunction_Check(rxObj) &&
(self = PyCFunction_GET_SELF(rxObj)) != NULL &&
- sip_api_wrapper_check(self))
+ PyObject_TypeCheck(self, (PyTypeObject *)&sipSimpleWrapper_Type))
{
/*
* It is a wrapped C++ class method. We can't keep a copy
siplib/qtlib.c
@@ -1,7 +1,7 @@
/*
* The SIP module interface.
*
- * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com>
+ * Copyright (c) 2009 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -50,8 +50,8 @@ extern "C" {
/*
* Define the SIP version number.
*/
-#define SIP_VERSION 0x040708
-#define SIP_VERSION_STR "4.7.8-snapshot-20081102"
+#define SIP_VERSION 0x040800
+#define SIP_VERSION_STR "4.8-snapshot-20090225"
/*
@@ -64,7 +64,9 @@ extern "C" {
*
* History:
*
- * 3.8 Added sip_api_register_meta_type() and sip_api_deprecated().
+ * 4.0 Much refactoring.
+ *
+ * 3.8 Added sip_api_register_qt_metatype() and sip_api_deprecated().
* Added qt_register_meta_type() to the Qt support API.
* The C/C++ names of enums and types are now always defined in the
* relevant structures and don't default to the Python name.
@@ -134,8 +136,8 @@ extern "C" {
*
* 0.0 Original version.
*/
-#define SIP_API_MAJOR_NR 3
-#define SIP_API_MINOR_NR 8
+#define SIP_API_MAJOR_NR 4
+#define SIP_API_MINOR_NR 0
/* Some compatibility stuff to help with handwritten code for SIP v3. */
@@ -180,7 +182,7 @@ typedef int sip_gilstate_t;
/*
- * The metatype of a wrapper type.
+ * The meta-type of a wrapper type.
*/
typedef struct _sipWrapperType {
/*
@@ -189,26 +191,23 @@ typedef struct _sipWrapperType {
*/
PyHeapTypeObject super;
- /* The additional type information. */
+ /* The generated type structure. */
struct _sipTypeDef *type;
/* The list of init extenders. */
struct _sipInitExtenderDef *iextend;
- /* The optional PyQt defined Q_OBJECT information. */
- void *qt_qobject;
+ /* Set if the type's dictionary contains all lazy attributes. */
+ int dict_complete;
} sipWrapperType;
/*
- * The type of a C/C++ wrapper object.
+ * The type of a simple C/C++ wrapper object.
*/
-typedef struct _sipWrapper {
+typedef struct _sipSimpleWrapper {
PyObject_HEAD
- /* For the user to use. */
- PyObject *user;
-
union {
/* C/C++ object pointer. */
void *cppPtr;
@@ -220,14 +219,23 @@ typedef struct _sipWrapper {
/* Object flags. */
int flags;
+ /* For the user to use. */
+ PyObject *user;
+
/* The instance dictionary. */
PyObject *dict;
- /* Python signal list (complex). */
- struct _sipPySig *pySigList;
-
/* Next object at this address. */
- struct _sipWrapper *next;
+ struct _sipSimpleWrapper *next;
+} sipSimpleWrapper;
+
+
+/*
+ * The type of a C/C++ wrapper object that supports parent/child relationships.
+ */
+typedef struct _sipWrapper {
+ /* The super-type. */
+ sipSimpleWrapper super;
/* First child object. */
struct _sipWrapper *first_child;
@@ -244,24 +252,41 @@ typedef struct _sipWrapper {
/*
+ * The meta-type of an enum type. (This is exposed only to support the
+ * deprecated sipConvertFromNamedEnum() macro.)
+ */
+typedef struct _sipEnumTypeObject {
+ /*
+ * The super-metatype. This must be first in the structure so that it can
+ * be cast to a PyTypeObject *.
+ */
+ PyHeapTypeObject super;
+
+ /* The generated type structure. */
+ struct _sipTypeDef *type;
+} sipEnumTypeObject;
+
+
+/*
* Some convenient function pointers.
*/
-typedef void *(*sipInitFunc)(sipWrapper *, PyObject *, sipWrapper **, int *);
+typedef void *(*sipInitFunc)(sipSimpleWrapper *, PyObject *, sipWrapper **,
+ int *);
typedef int (*sipTraverseFunc)(void *, visitproc, void *);
typedef int (*sipClearFunc)(void *);
typedef SIP_SSIZE_T (*sipBufferFunc)(PyObject *, void *, SIP_SSIZE_T, void **);
typedef SIP_SSIZE_T (*sipSegCountFunc)(PyObject *, void *, SIP_SSIZE_T *);
-typedef void (*sipDeallocFunc)(sipWrapper *);
-typedef void *(*sipCastFunc)(void *, sipWrapperType *);
-typedef sipWrapperType *(*sipSubClassConvertFunc)(void **);
-typedef void *(*sipForceConvertToFunc)(PyObject *, int *);
+typedef void (*sipDeallocFunc)(sipSimpleWrapper *);
+typedef void *(*sipCastFunc)(void *, const struct _sipTypeDef *);
+typedef const struct _sipTypeDef *(*sipSubClassConvertFunc)(void **);
typedef int (*sipConvertToFunc)(PyObject *, void **, int *, PyObject *);
typedef PyObject *(*sipConvertFromFunc)(void *, PyObject *);
typedef int (*sipVirtHandlerFunc)(void *, PyObject *, ...);
-typedef int (*sipEmitFunc)(sipWrapper *, PyObject *);
typedef void (*sipReleaseFunc)(void *, int);
typedef PyObject *(*sipPickleFunc)(void *);
-typedef void (*sipAssignFunc)(void *, const void *);
+typedef int (*sipAttrGetterFunc)(const struct _sipTypeDef *, PyObject *);
+typedef PyObject *(*sipVariableGetterFunc)(void *, PyObject *);
+typedef int (*sipVariableSetterFunc)(void *, PyObject *);
/*
@@ -295,32 +320,11 @@ typedef struct _sipEnumMemberDef {
/*
- * The information describing a named enum.
- */
-typedef struct _sipEnumDef {
- /*
- * The Python name of the enum. This includes the name of the containing
- * module which should be removed when SIP_API_MAJOR_NR is moved to 4.
- */
- const char *e_name;
-
- /* The C/C++ name of the enum. */
- const char *e_cname;
-
- /* The scoping type. */
- int e_scope;
-
- /* The Python slots. */
- struct _sipPySlotDef *e_pyslots;
-} sipEnumDef;
-
-
-/*
* The information describing static instances.
*/
typedef struct _sipInstancesDef {
- /* The classes. */
- struct _sipClassInstanceDef *id_class;
+ /* The types. */
+ struct _sipTypeInstanceDef *id_type;
/* The void *. */
struct _sipVoidPtrInstanceDef *id_voidp;
@@ -348,9 +352,6 @@ typedef struct _sipInstancesDef {
/* The doubles. */
struct _sipDoubleInstanceDef *id_double;
-
- /* The enums. */
- struct _sipEnumInstanceDef *id_enum;
} sipInstancesDef;
@@ -380,7 +381,7 @@ typedef struct _sipSubClassConvertorDef {
sipEncodedClassDef scc_base;
/* The base type. */
- sipWrapperType *scc_basetype;
+ struct _sipTypeDef *scc_basetype;
} sipSubClassConvertorDef;
@@ -467,156 +468,193 @@ typedef struct _sipPySlotExtenderDef {
/*
- * This enumerates the different dynamic signal argument types.
- */
-typedef enum {
- unknown_sat,
- char_sat,
- uchar_sat,
- string_sat,
- ustring_sat,
- short_sat,
- ushort_sat,
- int_sat,
- uint_sat,
- long_sat,
- ulong_sat,
- longlong_sat,
- ulonglong_sat,
- float_sat,
- double_sat,
- enum_sat,
- bool_sat,
- void_sat,
- class_sat,
- classp_sat,
- mtype_sat,
- mtypep_sat,
- qvariant_sat,
- qvariantp_sat,
- pyobject_sat,
- schar_sat,
- sstring_sat,
- wchar_sat,
- wstring_sat
-} sipSigArgType;
-
-
-/*
* The information describing a typedef.
*/
typedef struct _sipTypedefDef {
/* The typedef name. */
const char *tdd_name;
- /* The typedef type. */
- sipSigArgType tdd_type;
-
- /* The type name for enum_sat, class_sat and mtype_sat. */
+ /* The typedef value. */
const char *tdd_type_name;
-
- /* The defining module, NULL if the current one. */
- const char *tdd_mod_name;
} sipTypedefDef;
/*
- * The information describing a type.
+ * The information describing a variable.
+ */
+typedef struct _sipVariableDef {
+ /* The variable name. */
+ const char *vd_name;
+
+ /* The variable getter. */
+ sipVariableGetterFunc vd_getter;
+
+ /* The variable setter. It is NULL if the variable is const. */
+ sipVariableSetterFunc vd_setter;
+
+ /* This is set if the variable is static. */
+ int vd_is_static;
+} sipVariableDef;
+
+
+/*
+ * The information describing a type, either a C++ class (or C struct), a C++
+ * namespace, a mapped type or a named enum.
*/
typedef struct _sipTypeDef {
- /* The module. */
+ /* The version number, 0 if the type isn't versioned. */
+ unsigned td_version_nr;
+
+ /* The next version of this type. */
+ struct _sipTypeDef *td_next_version;
+
+ /* The module, 0 if the type hasn't been initialised. */
struct _sipExportedModuleDef *td_module;
/* Type flags, see the sipType*() macros. */
int td_flags;
+ /* The C/C++ name of the type. */
+ int td_cname;
+
/*
- * The Python name of the type. This includes the name of the containing
- * module which should be removed when SIP_API_MAJOR_NR is moved to 4.
+ * The Python type object. This needs to be a union until we remove the
+ * deprecated sipClass_* macros.
*/
- const char *td_name;
+ union {
+ PyTypeObject *td_py_type;
+ sipWrapperType *td_wrapper_type;
+ } u;
+} sipTypeDef;
- /* The C/C++ name of the type. */
- const char *td_cname;
- /* The scoping type. */
- sipEncodedClassDef td_scope;
+/*
+ * The information describing a C++ class (or C struct) or a C++ namespace.
+ */
+typedef struct _sipClassTypeDef {
+ /* The base type information. */
+ sipTypeDef ctd_base;
+
+ /* The Python name of the type, -1 if this is a namespace extender. */
+ int ctd_name;
+
+ /*
+ * The meta-type name, -1 to use the meta-type of the first super-type
+ * (normally sipWrapperType).
+ */
+ int ctd_metatype;
+
+ /* The super-type name, -1 to use sipWrapper. */
+ int ctd_supertype;
+
+ /*
+ * The scoping type or the namespace this is extending if it is a namespace
+ * extender.
+ */
+ sipEncodedClassDef ctd_scope;
/* The super-types. */
- sipEncodedClassDef *td_supers;
+ sipEncodedClassDef *ctd_supers;
/* The table of Python slots. */
- sipPySlotDef *td_pyslots;
+ sipPySlotDef *ctd_pyslots;
/* The number of lazy methods. */
- int td_nrmethods;
+ int ctd_nrmethods;
/* The table of lazy methods. */
- PyMethodDef *td_methods;
+ PyMethodDef *ctd_methods;
/* The number of lazy enum members. */
- int td_nrenummembers;
+ int ctd_nrenummembers;
/* The table of lazy enum members. */
- sipEnumMemberDef *td_enummembers;
+ sipEnumMemberDef *ctd_enummembers;
- /* The variable table. */
- PyMethodDef *td_variables;
+ /* The number of variables. */
+ int ctd_nrvariables;
+
+ /* The table of variables. */
+ sipVariableDef *ctd_variables;
/* The initialisation function. */
- sipInitFunc td_init;
+ sipInitFunc ctd_init;
/* The traverse function. */
- sipTraverseFunc td_traverse;
+ sipTraverseFunc ctd_traverse;
/* The clear function. */
- sipClearFunc td_clear;
+ sipClearFunc ctd_clear;
/* The read buffer function. */
- sipBufferFunc td_readbuffer;
+ sipBufferFunc ctd_readbuffer;
/* The write buffer function. */
- sipBufferFunc td_writebuffer;
+ sipBufferFunc ctd_writebuffer;
/* The segment count function. */
- sipSegCountFunc td_segcount;
+ sipSegCountFunc ctd_segcount;
/* The char buffer function. */
- sipBufferFunc td_charbuffer;
+ sipBufferFunc ctd_charbuffer;
/* The deallocation function. */
- sipDeallocFunc td_dealloc;
+ sipDeallocFunc ctd_dealloc;
+
+ /* The release function, 0 if a C strict. */
+ sipReleaseFunc ctd_release;
/* The cast function, 0 if a C struct. */
- sipCastFunc td_cast;
+ sipCastFunc ctd_cast;
+
+ /* The optional convert to function. */
+ sipConvertToFunc ctd_cto;
+
+ /* The static instances. */
+ sipInstancesDef ctd_instances;
+
+ /* The next namespace extender. */
+ struct _sipClassTypeDef *ctd_nsextender;
+
+ /* The pickle function. */
+