small modifications in isobar

hurricane/src/isobar/PyEntity.cpp

@@ -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"

hurricane/src/isobar/PyLibrary.cpp

@@ -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);
+      __cs.init ("Library.new");
-          library = Library::create(db, *PYNAME_O(arg1));
+      if (!PyArg_ParseTuple(args,"O&O&:Library.new", Converter, &arg0, Converter, &arg1)) {
-          HCATCH
+        PyErr_SetString ( ConstructorError, "invalid number of parameters for Library constructor." );
-      } 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");
         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 );
   }

hurricane/src/isobar/PyNet.cpp

@@ -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;
 

hurricane/src/isobar/PyPath.cpp

@@ -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" {
 

hurricane/src/isobar/PyReference.cpp

@@ -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" {
 

hurricane/src/isobar/hurricane/isobar/PyCell.h

@@ -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