small modifications in isobar

This commit is contained in:
Christophe Alexandre 2008-11-30 20:33:42 +00:00
parent fc63d5dd6c
commit d5d17466d4
6 changed files with 22 additions and 19 deletions

View File

@ -49,6 +49,7 @@
// | | // | |
// x-----------------------------------------------------------------x // x-----------------------------------------------------------------x
#include "hurricane/Cell.h"
#include "hurricane/isobar/PyNet.h" #include "hurricane/isobar/PyNet.h"
#include "hurricane/isobar/PyLayer.h" #include "hurricane/isobar/PyLayer.h"
#include "hurricane/isobar/PyPoint.h" #include "hurricane/isobar/PyPoint.h"

View File

@ -179,20 +179,24 @@ extern "C" {
PyObject* arg0; PyObject* arg0;
PyObject* arg1; PyObject* arg1;
Library* library = NULL; Library* library = NULL;
if (ParseTwoArg("Library.new", args, ":db:name", &arg0, &arg1)) {
HTRY HTRY
__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); DataBase* db = PYDATABASE_O(arg0);
library = Library::create(db, *PYNAME_O(arg1)); library = Library::create(db, *PYNAME_O(arg1));
HCATCH } else if (__cs.getObjectIds() == ":library:name") {
} else if (ParseTwoArg("Library.new", args, ":library:name", &arg0, &arg1)) {
HTRY
Library* masterLibrary = PYLIBRARY_O(arg0); Library* masterLibrary = PYLIBRARY_O(arg0);
library = Library::create(masterLibrary, *PYNAME_O(arg1)); library = Library::create(masterLibrary, *PYNAME_O(arg1));
HCATCH
} else { } else {
PyErr_SetString(ConstructorError, "wrong arguments"); PyErr_SetString ( ConstructorError, "invalid number of parameters for Library constructor." );
return NULL; return NULL;
} }
HCATCH
return PyLibrary_Link ( library ); return PyLibrary_Link ( library );
} }

View File

@ -61,6 +61,7 @@
#include "hurricane/isobar/PyComponentCollection.h" #include "hurricane/isobar/PyComponentCollection.h"
#include "hurricane/isobar/PyPinCollection.h" #include "hurricane/isobar/PyPinCollection.h"
#include "hurricane/Cell.h"
#include "hurricane/NetExternalComponents.h" #include "hurricane/NetExternalComponents.h"
using namespace Hurricane; using namespace Hurricane;

View File

@ -49,6 +49,9 @@
// | | // | |
// x-----------------------------------------------------------------x // x-----------------------------------------------------------------x
#include "hurricane/Cell.h"
using namespace Hurricane;
#include "hurricane/isobar/PyTransformation.h" #include "hurricane/isobar/PyTransformation.h"
#include "hurricane/isobar/PyName.h" #include "hurricane/isobar/PyName.h"
#include "hurricane/isobar/PyPath.h" #include "hurricane/isobar/PyPath.h"
@ -56,10 +59,8 @@
#include "hurricane/isobar/PyInstance.h" #include "hurricane/isobar/PyInstance.h"
#include "hurricane/isobar/PyInstanceCollection.h" #include "hurricane/isobar/PyInstanceCollection.h"
namespace Isobar { namespace Isobar {
using namespace Hurricane;
extern "C" { extern "C" {

View File

@ -50,7 +50,8 @@
// x-----------------------------------------------------------------x // x-----------------------------------------------------------------x
#include "hurricane/Cell.h"
using namespace Hurricane;
#include "hurricane/isobar/PyReference.h" #include "hurricane/isobar/PyReference.h"
#include "hurricane/isobar/PyPoint.h" #include "hurricane/isobar/PyPoint.h"
@ -61,7 +62,6 @@
namespace Isobar { namespace Isobar {
using namespace Hurricane;
extern "C" { extern "C" {

View File

@ -59,14 +59,13 @@
#include "hurricane/isobar/PyEntity.h" #include "hurricane/isobar/PyEntity.h"
#include "hurricane/Cell.h"
namespace Hurricane {
class Cell;
}
namespace Isobar { namespace Isobar {
using namespace Hurricane;
extern "C" { extern "C" {
@ -101,7 +100,4 @@ extern "C" {
} // End of Isobar namespace. } // End of Isobar namespace.
#endif
# endif