riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplifications and improvments in Isobar

This commit is contained in:
Christophe Alexandre 2008-10-12 13:37:33 +00:00
parent 48b0e4c3c6
commit 5faaf81b59
37 changed files with 133 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hurricane/src/hviewer/CMakeLists.txt
View File

@ -4,6 +4,11 @@
include_directories ( ${HURRICANE_SOURCE_DIR}/src/hurricane
${HURRICANE_SOURCE_DIR}/src/hviewer )
set ( hierarchy_viewer_cpps hierarchy/HierarchyScene.cpp
hierarchy/HierarchyItem.cpp
hierarchy/Arrow.cpp
)
set ( mocincludes hurricane/viewer/HPaletteEntry.h
hurricane/viewer/LayerPaletteEntry.h
hurricane/viewer/HExtensionPaletteEntry.h
@ -82,6 +87,7 @@
HNetlistModel.cpp
HNetlist.cpp
HDisplayFilter.cpp
${hierarchy_viewer_cpps}
)
qt4_wrap_cpp ( MOC_SRCS ${mocincludes} )

5
hurricane/src/isobar/ProxyProperty.cpp
View File

@ -98,7 +98,7 @@ namespace {
// x-----------------------------------------------------------------x
Name ProxyProperty::_name = "::ProxyProperty";
Name ProxyProperty::_name = "Isobar::ProxyProperty";
int ProxyProperty::_offset = -1;
@ -124,8 +124,7 @@ ProxyProperty::ProxyProperty ( void* shadow )
// -------------------------------------------------------------------
// Constructor : "ProxyProperty::create ()".
ProxyProperty* ProxyProperty::create ( void* shadow )
{
ProxyProperty* ProxyProperty::create ( void* shadow ) {
ProxyProperty* property = new ProxyProperty ( shadow );
if ( property == NULL )

2
hurricane/src/isobar/PyBox.cpp
View File

@ -494,7 +494,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyBox Object Definitions.
PyTypeRootObjectDefinitions(Box)
PyTypeObjectDefinitions(Box)
# endif // End of Shared Library Code Part.

25
hurricane/src/isobar/PyCell.cpp
View File

@ -656,26 +656,7 @@ extern "C" {
return PyCell_Link(cell);
}
static void PyCell_DeAlloc ( PyCell *self ) {
trace << "PyDbObject_DeAlloc(" << hex << self << ") "
<< self->ACCESS_OBJECT << endl;
if ( self->ACCESS_OBJECT != NULL ) {
ProxyProperty* proxy = dynamic_cast<ProxyProperty*>
( self->ACCESS_OBJECT->getProperty ( ProxyProperty::getPropertyName() ) ); \
if (proxy == NULL) {
ostringstream message;
message << "deleting a Python object with no Proxy attached ";
cerr << "yes man" << endl;
PyErr_SetString ( ProxyError, message.str().c_str() );
}
self->ACCESS_OBJECT->remove ( proxy );
} else {
cerr << "ACCESS_OBJECT is NULL" << endl;
}
PyObject_DEL ( self );
}
DBoDeleteMethod(Cell)
PyTypeObjectLinkPyType(Cell)
PyTypeObjectConstructor(Cell)
@ -688,12 +669,12 @@ extern "C" {
// Link/Creation Method.
DBoLinkCreateMethod(PyCell_Link,PyCell,PyTypeCell,Cell)
DBoLinkCreateMethod(Cell)
// ---------------------------------------------------------------
// PyCell Object Definitions.
PyTypeInheritedObjectDefinitions(Cell, Entity)
PyTypeObjectDefinitions(Cell)
#endif // End of Shared Library Code Part.

2
hurricane/src/isobar/PyCellLocator.cpp
View File

@ -134,7 +134,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyCellLocator Object Definitions.
PyTypeRootObjectDefinitions(CellLocator)
PyTypeObjectDefinitions(CellLocator)
# endif // End of Shared Library Code Part.

2
hurricane/src/isobar/PyComponent.cpp
View File

@ -207,7 +207,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyComponent Object Definitions.
PyTypeInheritedObjectDefinitions(Component, Entity)
PyTypeObjectDefinitions(Component)
# endif // End of Shared Library Code Part.

2
hurricane/src/isobar/PyComponentLocator.cpp
View File

@ -127,7 +127,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyComponentLocator Object Definitions.
PyTypeRootObjectDefinitions(ComponentLocator)
PyTypeObjectDefinitions(ComponentLocator)
# endif // End of Shared Library Code Part.

4
hurricane/src/isobar/PyContact.cpp
View File

@ -222,14 +222,14 @@ extern "C" {
// Link/Creation Method.
DBoLinkCreateMethod(PyContact_Link,PyContact,PyTypeContact,Contact)
DBoLinkCreateMethod(Contact)
// ---------------------------------------------------------------
// PyContact Object Definitions.
PyTypeInheritedObjectDefinitions(Contact, Component)
PyTypeObjectDefinitions(Contact)
#endif // End of Shared Library Code Part.

22
hurricane/src/isobar/PyDataBase.cpp
View File

@ -43,7 +43,7 @@
// | Author : Jean-Paul CHAPUT |
// | E-mail : Jean-Paul.Chaput@asim.lip6.fr |
// | =============================================================== |
// | C++ Module : "./PyCataBase.cpp" |
// | C++ Module : "./PyDataBase.cpp" |
// | *************************************************************** |
// | U p d a t e s |
// | |
@ -63,25 +63,25 @@ using namespace Hurricane;
extern "C" {
# define METHOD_HEAD(function) GENERIC_METHOD_HEAD(DataBase,db,function)
#define METHOD_HEAD(function) GENERIC_METHOD_HEAD(DataBase,db,function)
// x=================================================================x
// | "PyDataBase" Python Module Code Part |
// x=================================================================x
# if defined(__PYTHON_MODULE__)
#if defined(__PYTHON_MODULE__)
// x-------------------------------------------------------------x
// | "PyDataBase" Attribute Methods |
// x-------------------------------------------------------------x
// x-------------------------------------------------------------x
// | "PyDataBase" Attribute Methods |
// x-------------------------------------------------------------x
// ---------------------------------------------------------------
// Attribute Method : "PyDataBase_getDataBase ()"
// ---------------------------------------------------------------
// Attribute Method : "PyDataBase_getDataBase ()"
PyObject* PyDataBase_getDataBase ( PyObject* module ) {
trace << "PyDataBase_getDataBase()" << endl;
@ -166,19 +166,19 @@ extern "C" {
// x=================================================================x
// | "PyCell" Shared Library Code Part |
// | "PyDataBase" Shared Library Code Part |
// x=================================================================x
// Link/Creation Method.
DBoLinkCreateMethod(PyDataBase_Link,PyDataBase,PyTypeDataBase,DataBase)
DBoLinkCreateMethod(DataBase)
// ---------------------------------------------------------------
// PyDataBase Object Definitions.
PyTypeRootObjectDefinitions(DataBase)
PyTypeObjectDefinitions(DataBase)
#endif // End of Shared Library Code Part.

2
hurricane/src/isobar/PyEntity.cpp
View File

@ -181,7 +181,7 @@ extern "C" {
}
PyTypeRootObjectDefinitions(Entity)
PyTypeObjectDefinitions(Entity)
// ---------------------------------------------------------------
// PyEntity Object Definitions.

6
hurricane/src/isobar/PyHorizontal.cpp
View File

@ -211,15 +211,13 @@ extern "C" {
// Link/Creation Method.
DBoLinkCreateMethod(PyHorizontal_Link,PyHorizontal,PyTypeHorizontal,Horizontal)
DBoLinkCreateMethod(Horizontal)
// ---------------------------------------------------------------
// PyHorizontal Object Definitions.
PyTypeInheritedObjectDefinitions(Horizontal, Segment)
PyTypeObjectDefinitions(Horizontal)
#endif // End of Shared Library Code Part.

4
hurricane/src/isobar/PyHurricane.cpp
View File

@ -135,10 +135,6 @@ using namespace Hurricane;
= "comp";
ConverterState __cs = ConverterState ();
int __objectOffset = offsetof ( PyPoint, _object );
map <void*,PyObject*> H2PMap;
// x-----------------------------------------------------------------x
// | "PyHurricane" C++ Functions |

2
hurricane/src/isobar/PyHyperNet.cpp
View File

@ -206,7 +206,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyHyperNet Object Definitions.
PyTypeRootObjectDefinitions(HyperNet)
PyTypeObjectDefinitions(HyperNet)
# endif // End of Shared Library Code Part.

10
hurricane/src/isobar/PyInstance.cpp
View File

@ -489,18 +489,16 @@ extern "C" {
// Link/Creation Method.
DBoLinkCreateMethod(PyInstance_Link,PyInstance,PyTypeInstance,Instance)
DBoLinkCreateMethod(Instance)
// ---------------------------------------------------------------
// PyInstance Object Definitions.
PyTypeInheritedObjectDefinitions(Instance, Entity)
PyTypeObjectDefinitions(Instance)
# endif // End of Shared Library Code Part.
#endif // End of Shared Library Code Part.
} // End of extern "C".
@ -509,5 +507,3 @@ extern "C" {
} // End of Isobar namespace.

2
hurricane/src/isobar/PyInstanceLocator.cpp
View File

@ -133,7 +133,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyInstanceLocator Object Definitions.
PyTypeRootObjectDefinitions(InstanceLocator)
PyTypeObjectDefinitions(InstanceLocator)

4
hurricane/src/isobar/PyLayer.cpp
View File

@ -179,7 +179,7 @@ extern "C" {
// Link/Creation Method.
DBoLinkCreateMethod(PyLayer_Link,PyLayer,PyTypeLayer,Layer)
DBoLinkCreateMethod(Layer)
@ -187,7 +187,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyLayer Object Definitions.
PyTypeRootObjectDefinitions(Layer)
PyTypeObjectDefinitions(Layer)
#endif // End of Shared Library Code Part.

4
hurricane/src/isobar/PyLibrary.cpp
View File

@ -206,7 +206,7 @@ extern "C" {
// Link/Creation Method.
DBoLinkCreateMethod(PyLibrary_Link,PyLibrary,PyTypeLibrary,Library)
DBoLinkCreateMethod(Library)
@ -214,7 +214,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyLibrary Object Definitions.
PyTypeRootObjectDefinitions(Library)
PyTypeObjectDefinitions(Library)
#endif // End of Shared Library Code Part.

2
hurricane/src/isobar/PyName.cpp
View File

@ -148,7 +148,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyName Object Definitions.
PyTypeRootObjectDefinitions(Name)
PyTypeObjectDefinitions(Name)
#endif // End of Shared Library Code Part.

4
hurricane/src/isobar/PyNet.cpp
View File

@ -587,7 +587,7 @@ extern "C" {
// Link/Creation Method.
DBoLinkCreateMethod(PyNet_Link,PyNet,PyTypeNet,Net)
DBoLinkCreateMethod(Net)
@ -595,7 +595,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyNet Object Definitions.
PyTypeInheritedObjectDefinitions(Net, Entity)
PyTypeObjectDefinitions(Net)
# endif // End of Shared Library Code Part.

2
hurricane/src/isobar/PyNetLocator.cpp
View File

@ -128,7 +128,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyNetLocator Object Definitions.
PyTypeRootObjectDefinitions(NetLocator)
PyTypeObjectDefinitions(NetLocator)
# endif // End of Shared Library Code Part.

2
hurricane/src/isobar/PyOccurrence.cpp
View File

@ -298,7 +298,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyOccurrence Object Definitions.
PyTypeRootObjectDefinitions(Occurrence)
PyTypeObjectDefinitions(Occurrence)
#endif // End of Shared Library Code Part.

2
hurricane/src/isobar/PyOccurrenceLocator.cpp
View File

@ -178,7 +178,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyOccurrenceLocator Object Definitions.
PyTypeRootObjectDefinitions(OccurrenceLocator)
PyTypeObjectDefinitions(OccurrenceLocator)
# endif // End of Shared Library Code Part.

4
hurricane/src/isobar/PyPath.cpp
View File

@ -367,10 +367,10 @@ extern "C" {
// ---------------------------------------------------------------
// PyPath Object Definitions.
PyTypeRootObjectDefinitions(Path)
PyTypeObjectDefinitions(Path)
# endif // End of Shared Library Code Part.
#endif // End of Shared Library Code Part.
} // End of extern "C".

4
hurricane/src/isobar/PyPin.cpp
View File

@ -238,7 +238,7 @@ extern "C" {
// Link/Creation Method.
DBoLinkCreateMethod(PyPin_Link,PyPin,PyTypePin,Pin)
DBoLinkCreateMethod(Pin)
@ -246,7 +246,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyPin Object Definitions.
PyTypeInheritedObjectDefinitions(Pin, Contact)
PyTypeObjectDefinitions(Pin)
#endif // End of Shared Library Code Part.

4
hurricane/src/isobar/PyPinLocator.cpp
View File

@ -135,9 +135,9 @@ extern "C" {
// PyPinLocator Object Definitions.
PyTypeRootObjectDefinitions(PinLocator)
PyTypeObjectDefinitions(PinLocator)
# endif // End of Shared Library Code Part.
#endif // End of Shared Library Code Part.
} // End of extern "C".

6
hurricane/src/isobar/PyPlug.cpp
View File

@ -202,16 +202,16 @@ extern "C" {
// Link/Creation Method.
DBoLinkCreateMethod(PyPlug_Link,PyPlug,PyTypePlug,Plug)
DBoLinkCreateMethod(Plug)
// ---------------------------------------------------------------
// PyPlug Object Definitions.
PyTypeInheritedObjectDefinitions(Plug, Component)
PyTypeObjectDefinitions(Plug)
# endif // End of Shared Library Code Part.
#endif // End of Shared Library Code Part.
} // End of extern "C".

2
hurricane/src/isobar/PyPlugLocator.cpp
View File

@ -128,7 +128,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyPlugLocator Object Definitions.
PyTypeRootObjectDefinitions(PlugLocator)
PyTypeObjectDefinitions(PlugLocator)
#endif // End of Shared Library Code Part.

2
hurricane/src/isobar/PyPoint.cpp
View File

@ -184,7 +184,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyPoint Object Definitions.
PyTypeRootObjectDefinitions(Point)
PyTypeObjectDefinitions(Point)
#endif // End of Shared Library Code Part.

7
hurricane/src/isobar/PyReference.cpp
View File

@ -242,16 +242,15 @@ extern "C" {
// Link/Creation Method.
DBoLinkCreateMethod(PyReference_Link,PyReference,PyTypeReference,Reference)
DBoLinkCreateMethod(Reference)
// ---------------------------------------------------------------
// PyReference Object Definitions.
PyTypeInheritedObjectDefinitions(Reference, Entity)
PyTypeObjectDefinitions(Reference)
# endif // End of Shared Library Code Part.
#endif // End of Shared Library Code Part.
} // End of extern "C".

2
hurricane/src/isobar/PyReferenceLocator.cpp
View File

@ -128,7 +128,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyReferenceLocator Object Definitions.
PyTypeRootObjectDefinitions(ReferenceLocator)
PyTypeObjectDefinitions(ReferenceLocator)
# endif // End of Shared Library Code Part.

2
hurricane/src/isobar/PySegment.cpp
View File

@ -175,7 +175,7 @@ extern "C" {
// PySegment Object Definitions.
PyTypeInheritedObjectDefinitions(Segment, Component)
PyTypeObjectDefinitions(Segment)
# endif // End of Shared Library Code Part.

4
hurricane/src/isobar/PySegmentLocator.cpp
View File

@ -135,10 +135,10 @@ extern "C" {
// ---------------------------------------------------------------
// PySegmentLocator Object Definitions.
PyTypeRootObjectDefinitions(SegmentLocator)
PyTypeObjectDefinitions(SegmentLocator)
# endif // End of Shared Library Code Part.
#endif // End of Shared Library Code Part.
} // End of extern "C".

4
hurricane/src/isobar/PyTechnology.cpp
View File

@ -185,11 +185,11 @@ extern "C" {
// Link/Creation Method.
DBoLinkCreateMethod(PyTechnology_Link,PyTechnology,PyTypeTechnology,Technology)
DBoLinkCreateMethod(Technology)
// ---------------------------------------------------------------
// PyTechnology Object Definitions.
PyTypeRootObjectDefinitions(Technology)
PyTypeObjectDefinitions(Technology)
#endif // End of Shared Library Code Part.

2
hurricane/src/isobar/PyTransformation.cpp
View File

@ -608,7 +608,7 @@ extern "C" {
// ---------------------------------------------------------------
// PyTransformation Object Definitions.
PyTypeRootObjectDefinitions(Transformation)
PyTypeObjectDefinitions(Transformation)
#endif // End of Shared Library Code Part.

11
hurricane/src/isobar/PyVertical.cpp
View File

@ -185,7 +185,7 @@ extern "C" {
HCATCH
return PyVertical_Link ( vertical );
return PyVertical_Link(vertical);
}
DBoDeleteMethod(Vertical)
@ -203,17 +203,14 @@ extern "C" {
// Link/Creation Method.
DBoLinkCreateMethod(PyVertical_Link,PyVertical,PyTypeVertical,Vertical)
DBoLinkCreateMethod(Vertical)
// ---------------------------------------------------------------
// PyVertical Object Definitions.
PyTypeInheritedObjectDefinitions(Vertical, Segment)
PyTypeObjectDefinitions(Vertical)
# endif // End of Shared Library Code Part.
#endif // End of Shared Library Code Part.
} // End of extern "C".

132
hurricane/src/isobar/hurricane/isobar/PyHurricane.h
View File

@ -72,11 +72,6 @@
namespace Isobar {
#if PY_VERSION_HEX < 0x02040000
#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
#endif
using namespace std;
@ -212,16 +207,13 @@ extern "C" {
// Miscellaneous.
# define DEFERRED_ADDRESS(ADDR) 0
// This macro must be redefined in derived classes.
// Example : _baseOject._object
# define ACCESS_OBJECT _object
# define ACCESS_CLASS(_pyObject) _pyObject
#define ACCESS_OBJECT _object
#define ACCESS_CLASS(_pyObject) _pyObject
# define LOAD_CONSTANT(CONSTANT_VALUE,CONSTANT_NAME) \
#define LOAD_CONSTANT(CONSTANT_VALUE,CONSTANT_NAME) \
constant = PyInt_FromLong ( (long)CONSTANT_VALUE ); \
PyDict_SetItemString ( dictionnary, CONSTANT_NAME, constant ); \
Py_DECREF ( constant );
@ -232,12 +224,12 @@ extern "C" {
// -------------------------------------------------------------------
// Generic Method Header.
# define GENERIC_METHOD_HEAD(SELF_TYPE,SELF_OBJECT,function) \
#define GENERIC_METHOD_HEAD(SELF_TYPE,SELF_OBJECT,function) \
if ( self->ACCESS_OBJECT == NULL ) { \
PyErr_SetString ( ProxyError, "Attempt to call " function " on an unbound hurricane object" ); \
return ( NULL ); \
} \
SELF_TYPE* SELF_OBJECT = dynamic_cast<SELF_TYPE*>(self->ACCESS_OBJECT); \
SELF_TYPE* SELF_OBJECT = dynamic_cast<SELF_TYPE*>(self->ACCESS_OBJECT);\
if ( self->ACCESS_OBJECT == NULL ) { \
PyErr_SetString ( ProxyError, "Invalid dynamic_cast while calling " function "" ); \
return ( NULL ); \
@ -249,7 +241,7 @@ extern "C" {
// -------------------------------------------------------------------
// Attribute Method Macro For Checking Bound.
# define GetBoundStateAttribute(PY_FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \
#define GetBoundStateAttribute(PY_FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \
static PyObject* PY_FUNC_NAME ( PY_SELF_TYPE *self ) \
{ \
long result = 1; \
@ -365,7 +357,7 @@ extern "C" {
// -------------------------------------------------------------------
// Attribute Method For getting Attributes.
# define DirectGetAttrMethod(PY_FUNC_NAME,PY_OBJECT_METHODS) \
#define DirectGetAttrMethod(PY_FUNC_NAME,PY_OBJECT_METHODS) \
static PyObject* PY_FUNC_NAME ( PyObject* self, char* name ) \
{ \
return ( Py_FindMethod(PY_OBJECT_METHODS,self,name) ); \
@ -389,7 +381,7 @@ extern "C" {
// -------------------------------------------------------------------
// Locator Attribute Method For Progress.
# define LocatorProgressAttribute(SELF_TYPE) \
#define LocatorProgressAttribute(SELF_TYPE) \
static PyObject* Py##SELF_TYPE##Locator_progress ( Py##SELF_TYPE##Locator *self ) \
{ \
trace << #SELF_TYPE "Locator.progress()" << endl; \
@ -553,7 +545,7 @@ extern "C" {
PyErr_SetString ( ProxyError, message.str().c_str() ); \
return ( NULL ); \
} \
ProxyProperty* proxy = dynamic_cast<ProxyProperty*> \
ProxyProperty* proxy = static_cast<ProxyProperty*> \
( self->ACCESS_OBJECT->getProperty ( ProxyProperty::getPropertyName() ) ); \
if (proxy == NULL) { \
ostringstream message; \
@ -569,17 +561,17 @@ extern "C" {
// -------------------------------------------------------------------
// Attribute Macro For BDo Link/Creation.
# define DBoLinkCreateMethod(PY_FUNC_NAME,PY_SELF_TYPE,PY_SELF_CLASS,SELF_TYPE) \
PyObject* PY_FUNC_NAME ( SELF_TYPE* object ) \
{ \
if ( object == NULL ) \
#define DBoLinkCreateMethod(SELF_TYPE) \
PyObject* Py##SELF_TYPE##_Link ( SELF_TYPE* object ) { \
if ( object == NULL ) { \
Py_RETURN_NONE; \
PY_SELF_TYPE* pyObject = NULL; \
} \
Py##SELF_TYPE* pyObject = NULL; \
HTRY \
ProxyProperty* proxy = dynamic_cast<ProxyProperty*> \
ProxyProperty* proxy = static_cast<ProxyProperty*> \
( object->getProperty ( ProxyProperty::getPropertyName() ) ); \
if ( proxy == NULL ) { \
pyObject = PyObject_NEW(PY_SELF_TYPE, &PY_SELF_CLASS); \
pyObject = PyObject_NEW(Py##SELF_TYPE, &PyType##SELF_TYPE); \
if (pyObject == NULL) { return NULL; } \
\
proxy = ProxyProperty::create ( (void*)pyObject ); \
@ -588,7 +580,7 @@ extern "C" {
pyObject->ACCESS_OBJECT = object; \
object->put ( proxy ); \
} else { \
pyObject = (PY_SELF_TYPE*)proxy->getShadow (); \
pyObject = (Py##SELF_TYPE*)proxy->getShadow (); \
Py_INCREF ( ACCESS_CLASS(pyObject) ); \
} \
HCATCH \
@ -606,7 +598,7 @@ extern "C" {
<< self->ACCESS_OBJECT << endl; \
\
if ( self->ACCESS_OBJECT != NULL ) { \
ProxyProperty* proxy = dynamic_cast<ProxyProperty*> \
ProxyProperty* proxy = static_cast<ProxyProperty*> \
( self->ACCESS_OBJECT->getProperty ( ProxyProperty::getPropertyName() ) ); \
if (proxy == NULL) { \
ostringstream message; \
@ -692,7 +684,7 @@ extern "C" {
HTRY \
if (!ParseOneArg("get" #CENGINE, args, CELL_ARG, &arg0 ) ) return ( NULL ); \
Cell* cell = PYCELL_O(arg0); \
cengine = dynamic_cast<CENGINE*>(getCEngine(cell, Name(#CENGINE))); \
cengine = static_cast<CENGINE*>(getCEngine(cell, Name(#CENGINE))); \
if (!cengine) { \
cengine = CENGINE::create (cell); \
} \
@ -700,15 +692,12 @@ extern "C" {
return Py##CENGINE##_Link( cengine ); \
}
// -------------------------------------------------------------------
// Object Definitions for inherited types
// root of the inheritance tree
# define PyTypeRootObjectDefinitions(SELF_TYPE) \
#define PyTypeObjectDefinitions(SELF_TYPE) \
PyTypeObject PyType##SELF_TYPE = \
{ PyObject_HEAD_INIT(&PyType_Type) \
{ PyObject_HEAD_INIT(NULL) \
0 /* ob_size. */ \
, #SELF_TYPE /* tp_name. */ \
, "Hurricane.##SELF_TYPE" /* tp_name. */ \
, sizeof(Py##SELF_TYPE) /* tp_basicsize. */ \
, 0 /* tp_itemsize. */ \
/* methods. */ \
@ -729,84 +718,13 @@ extern "C" {
, 0 /* tp_as_buffer. */ \
, Py_TPFLAGS_DEFAULT \
| Py_TPFLAGS_BASETYPE /* tp_flags. */ \
, 0 /* tp_doc. */ \
, 0 /* tp_traverse. */ \
, 0 /* tp_clear. */ \
, 0 /* tp_richcompare. */ \
, 0 /* tp_weaklistoffset.*/ \
, 0 /* tp_iter. */ \
, 0 /* tp_iternext. */ \
, 0 /* tp_methods. */ \
, 0 /* tp_members. */ \
, 0 /* tp_getset. */ \
, 0 /* tp_base. */ \
, 0 /* tp_dict. */ \
, 0 /* tp_descr_get. */ \
, 0 /* tp_descr_set. */ \
, 0 /* tp_dictoffset. */ \
, 0 /* tp_init. */ \
, 0 /* tp_alloc. */ \
, 0 /* tp_new. */ \
, 0 /* tp_free. */ \
, 0 /* tp_is_gc. */ \
};
// -------------------------------------------------------------------
// Object Definitions for types with inheritance (from Inherited or Root)
# define PyTypeInheritedObjectDefinitions(SELF_TYPE, INHERITED_TYPE) \
PyTypeObject PyType##SELF_TYPE = \
{ PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType##INHERITED_TYPE)) \
0 /* ob_size. */ \
, #SELF_TYPE /* tp_name. */ \
, sizeof(Py##SELF_TYPE) /* tp_basicsize. */ \
, 0 /* tp_itemsize. */ \
/* methods. */ \
, 0 /* tp_dealloc. */ \
, 0 /* tp_print. */ \
, 0 /* tp_getattr. */ \
, 0 /* tp_setattr. */ \
, 0 /* tp_compare. */ \
, 0 /* tp_repr. */ \
, 0 /* tp_as_number. */ \
, 0 /* tp_as_sequence. */ \
, 0 /* tp_as_mapping. */ \
, 0 /* tp_hash. */ \
, 0 /* tp_call. */ \
, 0 /* tp_str */ \
, 0 /* tp_getattro. */ \
, 0 /* tp_setattro. */ \
, 0 /* tp_as_buffer. */ \
, Py_TPFLAGS_DEFAULT \
| Py_TPFLAGS_BASETYPE /* tp_flags. */ \
, 0 /* tp_doc. */ \
, 0 /* tp_traverse. */ \
, 0 /* tp_clear. */ \
, 0 /* tp_richcompare. */ \
, 0 /* tp_weaklistoffset.*/ \
, 0 /* tp_iter. */ \
, 0 /* tp_iternext. */ \
, 0 /* tp_methods. */ \
, 0 /* tp_members. */ \
, 0 /* tp_getset. */ \
, DEFERRED_ADDRESS(&PyType##INHERITED_TYPE) \
/* tp_base. */ \
, 0 /* tp_dict. */ \
, 0 /* tp_descr_get. */ \
, 0 /* tp_descr_set. */ \
, 0 /* tp_dictoffset. */ \
, 0 /* tp_init. */ \
, 0 /* tp_alloc. */ \
, 0 /* tp_new. */ \
, 0 /* tp_free. */ \
, 0 /* tp_is_gc. */ \
, "#SELF_TYPE objects" /* tp_doc. */ \
};
// -------------------------------------------------------------------
//PyType_Ready Methods
# define PYTYPE_READY(TYPE) \
#define PYTYPE_READY(TYPE) \
if ( PyType_Ready( &PyType##TYPE ) < 0 ) { \
cerr << "[ERROR]\n" \
<< " Failed to initialize <Py" #TYPE ">." << endl; \
@ -814,7 +732,7 @@ extern "C" {
}
# define PYTYPE_READY_SUB(TYPE, TYPE_BASE) \
#define PYTYPE_READY_SUB(TYPE, TYPE_BASE) \
PyType##TYPE.tp_base = &PyType##TYPE_BASE; \
if ( PyType_Ready( &PyType##TYPE ) < 0 ) { \
cerr << "[ERROR]\n" \