small modifications in isobar
This commit is contained in:
parent
fc63d5dd6c
commit
d5d17466d4
|
@ -49,6 +49,7 @@
|
|||
// | |
|
||||
// x-----------------------------------------------------------------x
|
||||
|
||||
#include "hurricane/Cell.h"
|
||||
#include "hurricane/isobar/PyNet.h"
|
||||
#include "hurricane/isobar/PyLayer.h"
|
||||
#include "hurricane/isobar/PyPoint.h"
|
||||
|
|
|
@ -179,20 +179,24 @@ extern "C" {
|
|||
PyObject* arg0;
|
||||
PyObject* arg1;
|
||||
Library* library = NULL;
|
||||
if (ParseTwoArg("Library.new", args, ":db:name", &arg0, &arg1)) {
|
||||
|
||||
HTRY
|
||||
DataBase* db = PYDATABASE_O(arg0);
|
||||
library = Library::create(db, *PYNAME_O(arg1));
|
||||
HCATCH
|
||||
} else if (ParseTwoArg("Library.new", args, ":library:name", &arg0, &arg1)) {
|
||||
HTRY
|
||||
Library* masterLibrary = PYLIBRARY_O(arg0);
|
||||
library = Library::create(masterLibrary, *PYNAME_O(arg1));
|
||||
HCATCH
|
||||
} else {
|
||||
PyErr_SetString(ConstructorError, "wrong arguments");
|
||||
__cs.init ("Library.new");
|
||||
if (!PyArg_ParseTuple(args,"O&O&:Library.new", Converter, &arg0, Converter, &arg1)) {
|
||||
PyErr_SetString ( ConstructorError, "invalid number of parameters for Library constructor." );
|
||||
return NULL;
|
||||
}
|
||||
if (__cs.getObjectIds() == ":db:name") {
|
||||
DataBase* db = PYDATABASE_O(arg0);
|
||||
library = Library::create(db, *PYNAME_O(arg1));
|
||||
} else if (__cs.getObjectIds() == ":library:name") {
|
||||
Library* masterLibrary = PYLIBRARY_O(arg0);
|
||||
library = Library::create(masterLibrary, *PYNAME_O(arg1));
|
||||
} else {
|
||||
PyErr_SetString ( ConstructorError, "invalid number of parameters for Library constructor." );
|
||||
return NULL;
|
||||
}
|
||||
HCATCH
|
||||
|
||||
return PyLibrary_Link ( library );
|
||||
}
|
||||
|
|
|
@ -61,6 +61,7 @@
|
|||
#include "hurricane/isobar/PyComponentCollection.h"
|
||||
#include "hurricane/isobar/PyPinCollection.h"
|
||||
|
||||
#include "hurricane/Cell.h"
|
||||
#include "hurricane/NetExternalComponents.h"
|
||||
using namespace Hurricane;
|
||||
|
||||
|
|
|
@ -49,6 +49,9 @@
|
|||
// | |
|
||||
// x-----------------------------------------------------------------x
|
||||
|
||||
#include "hurricane/Cell.h"
|
||||
using namespace Hurricane;
|
||||
|
||||
#include "hurricane/isobar/PyTransformation.h"
|
||||
#include "hurricane/isobar/PyName.h"
|
||||
#include "hurricane/isobar/PyPath.h"
|
||||
|
@ -56,10 +59,8 @@
|
|||
#include "hurricane/isobar/PyInstance.h"
|
||||
#include "hurricane/isobar/PyInstanceCollection.h"
|
||||
|
||||
|
||||
namespace Isobar {
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -50,7 +50,8 @@
|
|||
// x-----------------------------------------------------------------x
|
||||
|
||||
|
||||
|
||||
#include "hurricane/Cell.h"
|
||||
using namespace Hurricane;
|
||||
|
||||
#include "hurricane/isobar/PyReference.h"
|
||||
#include "hurricane/isobar/PyPoint.h"
|
||||
|
@ -61,7 +62,6 @@
|
|||
|
||||
namespace Isobar {
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
|
|
@ -59,14 +59,13 @@
|
|||
|
||||
#include "hurricane/isobar/PyEntity.h"
|
||||
|
||||
#include "hurricane/Cell.h"
|
||||
|
||||
namespace Hurricane {
|
||||
class Cell;
|
||||
}
|
||||
|
||||
namespace Isobar {
|
||||
|
||||
using namespace Hurricane;
|
||||
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
||||
|
@ -101,7 +100,4 @@ extern "C" {
|
|||
|
||||
} // End of Isobar namespace.
|
||||
|
||||
|
||||
|
||||
|
||||
# endif
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue