jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hurricane cleaning still in progress

This commit is contained in:
The Coriolis Project 2008-03-18 09:42:44 +00:00
parent af0c4a4609
commit 7fb2d3222d
59 changed files with 123 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hurricane/src/hurricane/Cell.cpp
View File

@ -55,7 +55,7 @@ Cell::Cell(Library* library, const Name& name)
throw Error("Can't create " + _TName("Cell") + " " + getString(_name) + " : already exists"); throw Error("Can't create " + _TName("Cell") + " " + getString(_name) + " : already exists");
} }
Cell* Cell::Create(Library* library, const Name& name) Cell* Cell::create(Library* library, const Name& name)
// *************************************************** // ***************************************************
{ {
Cell* cell = new Cell(library, name); Cell* cell = new Cell(library, name);
@ -135,8 +135,8 @@ void Cell::FlattenNets(bool buildRings)
for_each_occurrence ( occurrence, getHyperNetRootNetOccurrences() ) { for_each_occurrence ( occurrence, getHyperNetRootNetOccurrences() ) {
HyperNet hyperNet ( occurrence ); HyperNet hyperNet ( occurrence );
if ( !occurrence.getPath().IsEmpty() ) { if ( !occurrence.getPath().IsEmpty() ) {
DeepNet* deepNet = DeepNet::Create ( hyperNet ); DeepNet* deepNet = DeepNet::create ( hyperNet );
if (deepNet) deepNet->_CreateRoutingPads ( buildRings ); if (deepNet) deepNet->_createRoutingPads ( buildRings );
} else { } else {
RoutingPad* previousRP = NULL; RoutingPad* previousRP = NULL;
RoutingPad* currentRP = NULL; RoutingPad* currentRP = NULL;
@ -156,7 +156,7 @@ void Cell::FlattenNets(bool buildRings)
} }
for_each_occurrence ( plugOccurrence, hyperNet.getLeafPlugOccurrences() ) { for_each_occurrence ( plugOccurrence, hyperNet.getLeafPlugOccurrences() ) {
currentRP = CreateRoutingPad ( net, plugOccurrence ); currentRP = createRoutingPad ( net, plugOccurrence );
currentRP->Materialize (); currentRP->Materialize ();
if ( buildRings ) { if ( buildRings ) {
if ( previousRP ) { if ( previousRP ) {
@ -176,7 +176,7 @@ void Cell::FlattenNets(bool buildRings)
for_each_component ( component, net->getComponents() ) { for_each_component ( component, net->getComponents() ) {
Pin* pin = dynamic_cast<Pin*>( component ); Pin* pin = dynamic_cast<Pin*>( component );
if ( pin ) { if ( pin ) {
currentRP = CreateRoutingPad ( pin ); currentRP = createRoutingPad ( pin );
if ( buildRings ) { if ( buildRings ) {
if ( previousRP ) { if ( previousRP ) {
currentRP->getBodyHook()->Attach ( previousRP->getBodyHook() ); currentRP->getBodyHook()->Attach ( previousRP->getBodyHook() );

17
hurricane/src/hurricane/Cell.h
View File

@ -178,7 +178,6 @@ class Cell : public Entity {
public: PinMap& _getPinMap() {return _pinMap;}; public: PinMap& _getPinMap() {return _pinMap;};
public: SliceMap& _getSliceMap() {return _sliceMap;}; public: SliceMap& _getSliceMap() {return _sliceMap;};
public: MarkerSet& _getMarkerSet() {return _markerSet;}; public: MarkerSet& _getMarkerSet() {return _markerSet;};
//public: ViewSet& _getViewSet() {return _viewSet;};
public: Cell* _getNextOfLibraryCellMap() const {return _nextOfLibraryCellMap;}; public: Cell* _getNextOfLibraryCellMap() const {return _nextOfLibraryCellMap;};
public: Cell* _getNextOfSymbolCellSet() const {return _nextOfSymbolCellSet;}; public: Cell* _getNextOfSymbolCellSet() const {return _nextOfSymbolCellSet;};
@ -193,21 +192,12 @@ class Cell : public Entity {
public: void _getSlaveEntities(SlaveEntityMap::iterator& begin, SlaveEntityMap::iterator& end); public: void _getSlaveEntities(SlaveEntityMap::iterator& begin, SlaveEntityMap::iterator& end);
public: void _getSlaveEntities(Entity* entity, SlaveEntityMap::iterator& begin, SlaveEntityMap::iterator& end); public: void _getSlaveEntities(Entity* entity, SlaveEntityMap::iterator& begin, SlaveEntityMap::iterator& end);
//public: bool _IsDrawable(View* view) const; #endif
//public: bool _ContentIsDrawable(View* view) const;
//public: void _DrawPhantoms(View* view, const Box& updateArea, const Transformation& transformation);
//public: void _DrawBoundaries(View* view, const Box& updateArea, const Transformation& transformation);
//public: void _DrawContent(View* view, BasicLayer* basicLayer, const Box& updateArea, const Transformation& transformation);
//public: void _DrawRubbers(View* view, const Box& updateArea, const Transformation& transformation);
//public: void _DrawMarkers(View* view, const Box& updateArea, const Transformation& transformation);
//public: void _DrawDisplaySlots(View* view, const Box& area, const Box& updateArea, const Transformation& transformation);
# endif
// Constructors // Constructors
// ************ // ************
public: static Cell* Create(Library* library, const Name& name); public: static Cell* create(Library* library, const Name& name);
// Accessors // Accessors
// ********* // *********
@ -249,9 +239,6 @@ class Cell : public Entity {
public: Pins getPins() const {return _pinMap.getElements();}; public: Pins getPins() const {return _pinMap.getElements();};
public: Slice* getSlice(const Layer* layer) const {return _sliceMap.getElement(layer);}; public: Slice* getSlice(const Layer* layer) const {return _sliceMap.getElement(layer);};
public: Slices getSlices(const Layer::Mask& mask = ~0) const; public: Slices getSlices(const Layer::Mask& mask = ~0) const;
// public: Views getViews() const {return _viewSet.getElements();};
// public: MainViews getMainViews() const;
// public: MainViews getImpactedMainViews() const;
public: Rubbers getRubbers() const; public: Rubbers getRubbers() const;
public: Rubbers getRubbersUnder(const Box& area) const; public: Rubbers getRubbersUnder(const Box& area) const;
public: Markers getMarkers() const {return _markerSet.getElements();}; public: Markers getMarkers() const {return _markerSet.getElements();};

4
hurricane/src/hurricane/Contact.cpp
View File

@ -125,7 +125,7 @@ Contact::Contact(Net* net, Component* anchor, Layer* layer, const Unit& dx, cons
_anchorHook.Attach(anchor->getBodyHook()); _anchorHook.Attach(anchor->getBodyHook());
} }
Contact* Contact::Create(Net* net, Layer* layer, const Unit& x, const Unit& y, const Unit& width, const Unit& height) Contact* Contact::create(Net* net, Layer* layer, const Unit& x, const Unit& y, const Unit& width, const Unit& height)
// **************************************************************************************************** // ****************************************************************************************************
{ {
Contact* contact = new Contact(net, layer, x, y, width, height); Contact* contact = new Contact(net, layer, x, y, width, height);
@ -135,7 +135,7 @@ Contact* Contact::Create(Net* net, Layer* layer, const Unit& x, const Unit& y, c
return contact; return contact;
} }
Contact* Contact::Create(Component* anchor, Layer* layer, const Unit& dx, const Unit& dy, const Unit& width, const Unit& height) Contact* Contact::create(Component* anchor, Layer* layer, const Unit& dx, const Unit& dy, const Unit& width, const Unit& height)
// **************************************************************************************************** // ****************************************************************************************************
{ {
if (!anchor) if (!anchor)

4
hurricane/src/hurricane/Contact.h
View File

@ -59,8 +59,8 @@ class Contact : public Component {
protected: Contact(Net* net, Layer* layer, const Unit& x, const Unit& y, const Unit& width = 0, const Unit& height = 0); protected: Contact(Net* net, Layer* layer, const Unit& x, const Unit& y, const Unit& width = 0, const Unit& height = 0);
protected: Contact(Net* net, Component* anchor, Layer* layer, const Unit& dx, const Unit& dy, const Unit& width = 0, const Unit& height = 0); protected: Contact(Net* net, Component* anchor, Layer* layer, const Unit& dx, const Unit& dy, const Unit& width = 0, const Unit& height = 0);
public: static Contact* Create(Net* net, Layer* layer, const Unit& x, const Unit& y, const Unit& width = 0, const Unit& height = 0); public: static Contact* create(Net* net, Layer* layer, const Unit& x, const Unit& y, const Unit& width = 0, const Unit& height = 0);
public: static Contact* Create(Component* anchor, Layer* layer, const Unit& dx, const Unit& dy, const Unit& width = 0, const Unit& height = 0); public: static Contact* create(Component* anchor, Layer* layer, const Unit& dx, const Unit& dy, const Unit& width = 0, const Unit& height = 0);
// Accessors // Accessors
// ********* // *********

2
hurricane/src/hurricane/DBo.cpp
View File

@ -146,7 +146,7 @@ Record* DBo::_getRecord() const
return record; return record;
} }
void DBo::_onDeleted(Property* property) void DBo::_onDestroyed(Property* property)
// ************************************* // *************************************
{ {
if (property && (_propertySet.find(property) != _propertySet.end())) { if (property && (_propertySet.find(property) != _propertySet.end())) {

2
hurricane/src/hurricane/DBo.h
View File

@ -63,7 +63,7 @@ class DBo : public NestedSlotAdapter {
public: virtual Record* _getRecord() const; public: virtual Record* _getRecord() const;
public: PropertySet& _getPropertySet() {return _propertySet;}; public: PropertySet& _getPropertySet() {return _propertySet;};
public: void _onDeleted(Property* property); public: void _onDestroyed(Property* property);
#endif #endif

2
hurricane/src/hurricane/DRCError.cpp
View File

@ -30,7 +30,7 @@ DRCError::DRCError(Cell* cell, const Name& name, const Box& boundingBox)
throw Error("Can't create " + _TName("DRCError") + " : empty bounding box"); throw Error("Can't create " + _TName("DRCError") + " : empty bounding box");
} }
DRCError* DRCError::Create(Cell* cell, const Name& name, const Box& boundingBox) DRCError* DRCError::create(Cell* cell, const Name& name, const Box& boundingBox)
// ***************************************************************************** // *****************************************************************************
{ {
DRCError* drcError = new DRCError(cell, name, boundingBox); DRCError* drcError = new DRCError(cell, name, boundingBox);

2
hurricane/src/hurricane/DRCError.h
View File

@ -36,7 +36,7 @@ class DRCError : public Marker {
protected: DRCError(Cell* cell, const Name& name, const Box& boundingBox); protected: DRCError(Cell* cell, const Name& name, const Box& boundingBox);
public: static DRCError* Create(Cell* cell, const Name& name, const Box& boundingBox); public: static DRCError* create(Cell* cell, const Name& name, const Box& boundingBox);
// Accessors // Accessors
// ********* // *********

2
hurricane/src/hurricane/DataBase.cpp
View File

@ -32,7 +32,7 @@ DataBase::DataBase()
throw Error("Can't create " + _TName("DataBase") + " : already exists"); throw Error("Can't create " + _TName("DataBase") + " : already exists");
} }
DataBase* DataBase::Create() DataBase* DataBase::create()
// ************************* // *************************
{ {
DataBase* dataBase = new DataBase(); DataBase* dataBase = new DataBase();

2
hurricane/src/hurricane/DataBase.h
View File

@ -58,7 +58,7 @@ class DataBase : public DBo {
# endif # endif
public: static DataBase* Create(); public: static DataBase* create();
// Accessors // Accessors
// ********* // *********

10
hurricane/src/hurricane/DeepNet.cpp
View File

@ -123,9 +123,9 @@ Record* DeepNet::_getRecord () const
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Constructor : "DeepNet::Create ()". // Constructor : "DeepNet::create ()".
DeepNet* DeepNet::Create ( HyperNet& hyperNet ) DeepNet* DeepNet::create ( HyperNet& hyperNet )
{ {
if ( !hyperNet.IsValid() ) if ( !hyperNet.IsValid() )
throw Error ( "Can't create " + _TName("DeepNet") + ": occurence is invalid." ); throw Error ( "Can't create " + _TName("DeepNet") + ": occurence is invalid." );
@ -145,9 +145,9 @@ DeepNet* DeepNet::Create ( HyperNet& hyperNet )
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Internal Modifier : "DeepNet::_CreateRoutingPads ()". // Internal Modifier : "DeepNet::_createRoutingPads ()".
size_t DeepNet::_CreateRoutingPads ( bool buildRings ) size_t DeepNet::_createRoutingPads ( bool buildRings )
{ {
size_t nbRoutingPads = 0; size_t nbRoutingPads = 0;
HyperNet hyperNet ( _netOccurrence ); HyperNet hyperNet ( _netOccurrence );
@ -157,7 +157,7 @@ size_t DeepNet::_CreateRoutingPads ( bool buildRings )
for_each_occurrence ( plugOccurrence, hyperNet.getLeafPlugOccurrences() ) { for_each_occurrence ( plugOccurrence, hyperNet.getLeafPlugOccurrences() ) {
nbRoutingPads++; nbRoutingPads++;
currentRP = CreateRoutingPad ( this, plugOccurrence ); currentRP = createRoutingPad ( this, plugOccurrence );
if ( buildRings ) { if ( buildRings ) {
if ( previousRP ) { if ( previousRP ) {
currentRP->getBodyHook()->Attach ( previousRP->getBodyHook() ); currentRP->getBodyHook()->Attach ( previousRP->getBodyHook() );

4
hurricane/src/hurricane/DeepNet.h
View File

@ -84,7 +84,7 @@ namespace Hurricane {
// Constructors. // Constructors.
public: public:
static DeepNet* Create ( HyperNet& hyperNet ); static DeepNet* create ( HyperNet& hyperNet );
// Accessors. // Accessors.
public: public:
@ -95,7 +95,7 @@ namespace Hurricane {
// Internal Modifiers. // Internal Modifiers.
public: public:
size_t _CreateRoutingPads ( bool buildRings=false ); size_t _createRoutingPads ( bool buildRings=false );
}; };

2
hurricane/src/hurricane/DisplaySlot.cpp
View File

@ -52,7 +52,7 @@ DisplaySlot::DisplaySlot(Cell* cell,const Name& name, unsigned short red1, unsig
//_fillGC = gtk_gc_new(red2, green2, blue2, pattern2, linewidth2); //_fillGC = gtk_gc_new(red2, green2, blue2, pattern2, linewidth2);
} }
DisplaySlot* DisplaySlot::Create(Cell* cell, const Name& name, unsigned short red1, unsigned short green1, unsigned short blue1, const string& pattern1, unsigned linewidth1, unsigned short red2, unsigned short green2, unsigned short blue2, const string& pattern2, unsigned linewidth2) DisplaySlot* DisplaySlot::create(Cell* cell, const Name& name, unsigned short red1, unsigned short green1, unsigned short blue1, const string& pattern1, unsigned linewidth1, unsigned short red2, unsigned short green2, unsigned short blue2, const string& pattern2, unsigned linewidth2)
// ****************************************** // ******************************************
{ {
DisplaySlot* displaySlot = new DisplaySlot(cell, name, red1, green1, blue1, pattern1, linewidth1, red2, green2, blue2, pattern2, linewidth2); DisplaySlot* displaySlot = new DisplaySlot(cell, name, red1, green1, blue1, pattern1, linewidth1, red2, green2, blue2, pattern2, linewidth2);

2
hurricane/src/hurricane/DisplaySlot.h
View File

@ -40,7 +40,7 @@ class DisplaySlot : public DBo {
// ************ // ************
protected: DisplaySlot(Cell* cell,const Name& name, unsigned short red1, unsigned short green1, unsigned short blue1, const string& pattern1, unsigned linewidth1, unsigned short red2, unsigned short green2, unsigned short blue2, const string& pattern2, unsigned linewidth2); protected: DisplaySlot(Cell* cell,const Name& name, unsigned short red1, unsigned short green1, unsigned short blue1, const string& pattern1, unsigned linewidth1, unsigned short red2, unsigned short green2, unsigned short blue2, const string& pattern2, unsigned linewidth2);
public: static DisplaySlot* Create(Cell* cell, const Name& name, unsigned short red1, unsigned short green1, unsigned short blue1, const string& pattern1 = "FFFFFFFFFFFFFFFF", unsigned linewidth1=0, unsigned short red2 = 0, unsigned short green2 = 0, unsigned short blue2 = 0, const string& pattern2 = "FFFFFFFFFFFFFFFF", unsigned linewidth2=0); public: static DisplaySlot* create(Cell* cell, const Name& name, unsigned short red1, unsigned short green1, unsigned short blue1, const string& pattern1 = "FFFFFFFFFFFFFFFF", unsigned linewidth1=0, unsigned short red2 = 0, unsigned short green2 = 0, unsigned short blue2 = 0, const string& pattern2 = "FFFFFFFFFFFFFFFF", unsigned linewidth2=0);
protected: virtual void _postCreate(); protected: virtual void _postCreate();
// Accessors // Accessors

4
hurricane/src/hurricane/Hook.cpp
View File

@ -313,7 +313,7 @@ Hook* Hook::Attach(Hook* hook)
if (rubber) if (rubber)
getComponent()->_SetRubber(rubber); getComponent()->_SetRubber(rubber);
else else
Rubber::_Create(this); Rubber::_create(this);
} }
// */ // */
@ -355,7 +355,7 @@ Hook* Hook::Merge(Hook* hook)
if (rubber) rubber->_destroy(); if (rubber) rubber->_destroy();
rubber = hook->getComponent()->getRubber(); rubber = hook->getComponent()->getRubber();
if (rubber) rubber->_destroy(); if (rubber) rubber->_destroy();
Rubber::_Create(this); Rubber::_create(this);
return this; return this;
} }

4
hurricane/src/hurricane/Horizontal.cpp
View File

@ -28,7 +28,7 @@ Horizontal::Horizontal(Net* net, Component* source, Component* target, Layer* la
{ {
} }
Horizontal* Horizontal::Create(Net* net, Layer* layer, const Unit& y, const Unit& width, const Unit& dxSource, const Unit& dxTarget) Horizontal* Horizontal::create(Net* net, Layer* layer, const Unit& y, const Unit& width, const Unit& dxSource, const Unit& dxTarget)
// **************************************************************************************************** // ****************************************************************************************************
{ {
if (!net) if (!net)
@ -41,7 +41,7 @@ Horizontal* Horizontal::Create(Net* net, Layer* layer, const Unit& y, const Unit
return horizontal; return horizontal;
} }
Horizontal* Horizontal::Create(Component* source, Component* target, Layer* layer, const Unit& y, const Unit& width, const Unit& dxSource, const Unit& dxTarget) Horizontal* Horizontal::create(Component* source, Component* target, Layer* layer, const Unit& y, const Unit& width, const Unit& dxSource, const Unit& dxTarget)
// **************************************************************************************************** // ****************************************************************************************************
{ {
if (!source) if (!source)

4
hurricane/src/hurricane/Horizontal.h
View File

@ -38,8 +38,8 @@ class Horizontal : public Segment {
protected: Horizontal(Net* net, Component* source, Component* target, Layer* layer, const Unit& y, const Unit& width = 0, const Unit& dxSource = 0, const Unit& dxTarget = 0); protected: Horizontal(Net* net, Component* source, Component* target, Layer* layer, const Unit& y, const Unit& width = 0, const Unit& dxSource = 0, const Unit& dxTarget = 0);
public: static Horizontal* Create(Net* net, Layer* layer, const Unit& y, const Unit& width = 0, const Unit& dxSource = 0, const Unit& dxTarget = 0); public: static Horizontal* create(Net* net, Layer* layer, const Unit& y, const Unit& width = 0, const Unit& dxSource = 0, const Unit& dxTarget = 0);
public: static Horizontal* Create(Component* source, Component* target, Layer* layer, const Unit& y, const Unit& width = 0, const Unit& dxSource = 0, const Unit& dxTarget = 0); public: static Horizontal* create(Component* source, Component* target, Layer* layer, const Unit& y, const Unit& width = 0, const Unit& dxSource = 0, const Unit& dxTarget = 0);
// Accessors // Accessors
// ********* // *********

8
hurricane/src/hurricane/Instance.cpp
View File

@ -182,7 +182,7 @@ Instance::Instance(Cell* cell, const Name& name, Cell* masterCell, const Transfo
throw Error("Can't create " + _TName("Instance") + " : cyclic construction"); throw Error("Can't create " + _TName("Instance") + " : cyclic construction");
} }
Instance* Instance::Create(Cell* cell, const Name& name, Cell* masterCell, bool secureFlag) Instance* Instance::create(Cell* cell, const Name& name, Cell* masterCell, bool secureFlag)
// **************************************************************************************** // ****************************************************************************************
{ {
Instance* instance = Instance* instance =
@ -193,7 +193,7 @@ Instance* Instance::Create(Cell* cell, const Name& name, Cell* masterCell, bool
return instance; return instance;
} }
Instance* Instance::Create(Cell* cell, const Name& name, Cell* masterCell, const Transformation& transformation, const PlacementStatus& placementstatus, bool secureFlag) Instance* Instance::create(Cell* cell, const Name& name, Cell* masterCell, const Transformation& transformation, const PlacementStatus& placementstatus, bool secureFlag)
// **************************************************************************************************** // ****************************************************************************************************
{ {
Instance* instance = Instance* instance =
@ -420,7 +420,7 @@ void Instance::SetMasterCell(Cell* masterCell, bool secureFlag)
_masterCell->_getSlaveInstanceSet()._Insert(this); _masterCell->_getSlaveInstanceSet()._Insert(this);
for_each_net(externalNet, _masterCell->getExternalNets()) { for_each_net(externalNet, _masterCell->getExternalNets()) {
if (!getPlug(externalNet)) Plug::_Create(this, externalNet); if (!getPlug(externalNet)) Plug::_create(this, externalNet);
end_for; end_for;
} }
} }
@ -433,7 +433,7 @@ void Instance::_postCreate()
_masterCell->_getSlaveInstanceSet()._Insert(this); _masterCell->_getSlaveInstanceSet()._Insert(this);
for_each_net(externalNet, _masterCell->getExternalNets()) { for_each_net(externalNet, _masterCell->getExternalNets()) {
Plug::_Create(this, externalNet); Plug::_create(this, externalNet);
end_for; end_for;
} }

4
hurricane/src/hurricane/Instance.h
View File

@ -101,8 +101,8 @@ class Instance : public Go {
protected: Instance(Cell* cell, const Name& name, Cell* masterCell, const Transformation& transformation, const PlacementStatus& placementstatus, bool secureFlag); protected: Instance(Cell* cell, const Name& name, Cell* masterCell, const Transformation& transformation, const PlacementStatus& placementstatus, bool secureFlag);
public: static Instance* Create(Cell* cell, const Name& name, Cell* masterCell, bool secureFlag = true); public: static Instance* create(Cell* cell, const Name& name, Cell* masterCell, bool secureFlag = true);
public: static Instance* Create(Cell* cell, const Name& name, Cell* masterCell, const Transformation& transformation, const PlacementStatus& placementstatus, bool secureFlag = true); public: static Instance* create(Cell* cell, const Name& name, Cell* masterCell, const Transformation& transformation, const PlacementStatus& placementstatus, bool secureFlag = true);
// Accessors // Accessors
// ********* // *********

4
hurricane/src/hurricane/Library.cpp
View File

@ -44,7 +44,7 @@ Library::Library(DataBase* dataBase, Library* library, const Name& name)
} }
} }
Library* Library::Create(DataBase* dataBase, const Name& name) Library* Library::create(DataBase* dataBase, const Name& name)
// *********************************************************** // ***********************************************************
{ {
Library* library = new Library(dataBase, NULL, name); Library* library = new Library(dataBase, NULL, name);
@ -54,7 +54,7 @@ Library* Library::Create(DataBase* dataBase, const Name& name)
return library; return library;
} }
Library* Library::Create(Library* library, const Name& name) Library* Library::create(Library* library, const Name& name)
// ********************************************************* // *********************************************************
{ {
if (!library) if (!library)

4
hurricane/src/hurricane/Library.h
View File

@ -73,8 +73,8 @@ class Library : public DBo {
protected: Library(DataBase* dataBase, Library* library, const Name& name); protected: Library(DataBase* dataBase, Library* library, const Name& name);
public: static Library* Create(DataBase* dataBase, const Name& name); public: static Library* create(DataBase* dataBase, const Name& name);
public: static Library* Create(Library* library, const Name& name); public: static Library* create(Library* library, const Name& name);
// Accessors // Accessors
// ********* // *********

6
hurricane/src/hurricane/Net.cpp
View File

@ -261,7 +261,7 @@ Net::Net(Cell* cell, const Name& name)
throw Error("Can't create " + _TName("Net ") + getString(_name) + " : already exists"); throw Error("Can't create " + _TName("Net ") + getString(_name) + " : already exists");
} }
Net* Net::Create(Cell* cell, const Name& name) Net* Net::create(Cell* cell, const Name& name)
// ******************************************* // *******************************************
{ {
Net* net = new Net(cell, name); Net* net = new Net(cell, name);
@ -452,7 +452,7 @@ void Net::SetExternal(bool isExternal)
OpenUpdateSession(); OpenUpdateSession();
SetPosition(Point(0, 0)); SetPosition(Point(0, 0));
for_each_instance(instance, _cell->getSlaveInstances()) { for_each_instance(instance, _cell->getSlaveInstances()) {
Plug::_Create(instance, this); Plug::_create(instance, this);
end_for; end_for;
} }
CloseUpdateSession(); CloseUpdateSession();
@ -590,7 +590,7 @@ void Net::_postCreate()
if (_isExternal) { if (_isExternal) {
for_each_instance(instance, _cell->getSlaveInstances()) { for_each_instance(instance, _cell->getSlaveInstances()) {
Plug::_Create(instance, this); Plug::_create(instance, this);
end_for; end_for;
} }
} }

2
hurricane/src/hurricane/Net.h
View File

@ -131,7 +131,7 @@ class Net : public Entity {
protected: Net(Cell* cell, const Name& name); protected: Net(Cell* cell, const Name& name);
public: static Net* Create(Cell* cell, const Name& name); public: static Net* create(Cell* cell, const Name& name);
// Accessors // Accessors
// ********* // *********

2
hurricane/src/hurricane/Occurrence.cpp
View File

@ -144,7 +144,7 @@ void Occurrence::Put(Property* property)
throw Error("Can't put property : null property"); throw Error("Can't put property : null property");
Quark* quark = _getQuark(); Quark* quark = _getQuark();
if (!quark) quark = Quark::_Create(*this); if (!quark) quark = Quark::_create(*this);
quark->put(property); quark->put(property);
} }

2
hurricane/src/hurricane/Pad.cpp
View File

@ -32,7 +32,7 @@ Pad::Pad(Net* net, Layer* layer, const Box& boundingBox)
throw Error("Can't create " + _TName("Pad") + " : empty bounding box"); throw Error("Can't create " + _TName("Pad") + " : empty bounding box");
} }
Pad* Pad::Create(Net* net, Layer* layer, const Box& boundingBox) Pad* Pad::create(Net* net, Layer* layer, const Box& boundingBox)
// ************************************************************* // *************************************************************
{ {
Pad* pad = new Pad(net, layer, boundingBox); Pad* pad = new Pad(net, layer, boundingBox);

2
hurricane/src/hurricane/Pad.h
View File

@ -39,7 +39,7 @@ class Pad : public Component {
protected: Pad(Net* net, Layer* layer, const Box& boundingBox); protected: Pad(Net* net, Layer* layer, const Box& boundingBox);
public: static Pad* Create(Net* net, Layer* layer, const Box& boundingBox); public: static Pad* create(Net* net, Layer* layer, const Box& boundingBox);
// Accessors // Accessors
// ********* // *********

2
hurricane/src/hurricane/Pin.cpp
View File

@ -32,7 +32,7 @@ Pin::Pin(Net* net, const Name& name, const AccessDirection& accessDirection, con
} }
Pin* Pin::Create(Net* net, const Name& name, const AccessDirection& accessDirection, const PlacementStatus& placementStatus, Layer* layer, const Unit& x, const Unit& y, const Unit& width, const Unit& height) Pin* Pin::create(Net* net, const Name& name, const AccessDirection& accessDirection, const PlacementStatus& placementStatus, Layer* layer, const Unit& x, const Unit& y, const Unit& width, const Unit& height)
// **************************************************************************************************** // ****************************************************************************************************
{ {
if (!net) if (!net)

2
hurricane/src/hurricane/Pin.h
View File

@ -87,7 +87,7 @@ class Pin : public Contact {
protected: Pin(Net* net, const Name& name, const AccessDirection& accessDirection, const PlacementStatus& placementStatus, Layer* layer, const Unit& x, const Unit& y, const Unit& width = 0, const Unit& height = 0); protected: Pin(Net* net, const Name& name, const AccessDirection& accessDirection, const PlacementStatus& placementStatus, Layer* layer, const Unit& x, const Unit& y, const Unit& width = 0, const Unit& height = 0);
public: static Pin* Create(Net* net, const Name& name, const AccessDirection& accessDirection, const PlacementStatus& placementStatus, Layer* layer, const Unit& x, const Unit& y, const Unit& width = 0, const Unit& height = 0); public: static Pin* create(Net* net, const Name& name, const AccessDirection& accessDirection, const PlacementStatus& placementStatus, Layer* layer, const Unit& x, const Unit& y, const Unit& width = 0, const Unit& height = 0);
// Accessors // Accessors
// ********* // *********

2
hurricane/src/hurricane/Plug.cpp
View File

@ -143,7 +143,7 @@ void Plug::SetNet(Net* net)
} }
} }
Plug* Plug::_Create(Instance* instance, Net* masterNet) Plug* Plug::_create(Instance* instance, Net* masterNet)
// **************************************************** // ****************************************************
{ {
Plug* plug = new Plug(instance, masterNet); Plug* plug = new Plug(instance, masterNet);

2
hurricane/src/hurricane/Plug.h
View File

@ -83,7 +83,7 @@ class Plug : public Component {
// Others // Others
// ****** // ******
public: static Plug* _Create(Instance* instance, Net* masterNet); public: static Plug* _create(Instance* instance, Net* masterNet);
protected: virtual void _postCreate(); protected: virtual void _postCreate();
public: void _destroy(); public: void _destroy();

4
hurricane/src/hurricane/Property.cpp
View File

@ -66,7 +66,7 @@ void PrivateProperty::_preDestroy()
{ {
Inherit::_preDestroy(); Inherit::_preDestroy();
if (_owner) _owner->_onDeleted(this); if (_owner) _owner->_onDestroyed(this);
} }
void PrivateProperty::onCapturedBy(DBo* owner) void PrivateProperty::onCapturedBy(DBo* owner)
@ -124,7 +124,7 @@ void SharedProperty::_preDestroy()
while (!_ownerSet.empty()) { while (!_ownerSet.empty()) {
DBo* owner = *_ownerSet.begin(); DBo* owner = *_ownerSet.begin();
_ownerSet.erase(owner); _ownerSet.erase(owner);
owner->_onDeleted(this); owner->_onDestroyed(this);
} }
} }

2
hurricane/src/hurricane/Property.h
View File

@ -287,7 +287,7 @@ template<class Value> class StandardSharedProperty : public SharedProperty {
{ {
}; };
public: static StandardSharedProperty* Create(const Name& name, const Value& value ) public: static StandardSharedProperty* create(const Name& name, const Value& value )
// ********************************************************************************* // *********************************************************************************
{ {
StandardSharedProperty* property = new StandardSharedProperty(name, value); StandardSharedProperty* property = new StandardSharedProperty(name, value);

2
hurricane/src/hurricane/Quark.cpp
View File

@ -40,7 +40,7 @@ Quark::Quark(const Occurrence& occurrence)
throw Error("Can't create " + _TName("Quark") + " : already exists"); throw Error("Can't create " + _TName("Quark") + " : already exists");
} }
Quark* Quark::_Create(const Occurrence& occurrence) Quark* Quark::_create(const Occurrence& occurrence)
// ********************************************** // **********************************************
{ {
Quark* quark = new Quark(occurrence); Quark* quark = new Quark(occurrence);

2
hurricane/src/hurricane/Quark.h
View File

@ -46,7 +46,7 @@ class Quark : public DBo {
// Others // Others
// ****** // ******
public: static Quark* _Create(const Occurrence& occurrence); public: static Quark* _create(const Occurrence& occurrence);
protected: virtual void _postCreate(); protected: virtual void _postCreate();
protected: virtual void _preDestroy(); protected: virtual void _preDestroy();

6
hurricane/src/hurricane/Reference.cpp
View File

@ -36,7 +36,7 @@ Reference::Reference(Cell* cell, const Name& name, Unit x, Unit y)
throw Error("Can't create " + _TName("Reference") + " : empty name"); throw Error("Can't create " + _TName("Reference") + " : empty name");
} }
Reference* Reference::Create(Cell* cell, const Name& name, Unit x, Unit y) Reference* Reference::create(Cell* cell, const Name& name, Unit x, Unit y)
// *********************************************************************** // ***********************************************************************
{ {
Reference* reference = new Reference(cell, name, x, y); Reference* reference = new Reference(cell, name, x, y);
@ -46,10 +46,10 @@ Reference* Reference::Create(Cell* cell, const Name& name, Unit x, Unit y)
return reference; return reference;
} }
Reference* Reference::Create(Cell* cell, const Name& name, const Point& point) Reference* Reference::create(Cell* cell, const Name& name, const Point& point)
// *************************************************************************** // ***************************************************************************
{ {
return Create(cell,name,point.getX(),point.getY()); return create(cell,name,point.getX(),point.getY());
} }
Box Reference::getBoundingBox() const Box Reference::getBoundingBox() const

4
hurricane/src/hurricane/Reference.h
View File

@ -38,8 +38,8 @@ class Reference : public Marker {
protected: Reference(Cell* cell, const Name& name, Unit x, Unit y); protected: Reference(Cell* cell, const Name& name, Unit x, Unit y);
public: static Reference* Create(Cell* cell, const Name& name, Unit x, Unit y ); public: static Reference* create(Cell* cell, const Name& name, Unit x, Unit y );
public: static Reference* Create(Cell* cell, const Name& name, const Point& point ); public: static Reference* create(Cell* cell, const Name& name, const Point& point );
// Accessors // Accessors
// ********* // *********

12
hurricane/src/hurricane/RoutingPad.cpp
View File

@ -37,7 +37,7 @@ RoutingPad::RoutingPad(Net* net, const Point& p, Occurrence occurrence )
} }
RoutingPad* RoutingPad::Create(Net* net, Occurrence occurrence) RoutingPad* RoutingPad::create(Net* net, Occurrence occurrence)
// *********************************************************** // ***********************************************************
{ {
if (!net) if (!net)
@ -420,14 +420,14 @@ void RoutingPad::Builder::Scan(InputFile& inputFile, char*& arguments)
DBo* RoutingPad::Builder::CreateDBo() DBo* RoutingPad::Builder::CreateDBo()
// ******************************* // *******************************
{ {
return RoutingPad::Create(getNet(), getLayer(), getX(), getY(), getWidth(), getHeight()); return RoutingPad::create(getNet(), getLayer(), getX(), getY(), getWidth(), getHeight());
} }
RoutingPad::Builder ROUTINGPAD_BUILDER("RP"); RoutingPad::Builder ROUTINGPAD_BUILDER("RP");
#endif #endif
RoutingPad* CreateRoutingPad ( Net* net, Occurrence plugOccurrence ) RoutingPad* createRoutingPad ( Net* net, Occurrence plugOccurrence )
// ***************************************************************** // *****************************************************************
{ {
Component* bestComponent = NULL; Component* bestComponent = NULL;
@ -449,13 +449,13 @@ RoutingPad* CreateRoutingPad ( Net* net, Occurrence plugOccurrence )
throw Error ( message ); throw Error ( message );
} }
RoutingPad* rp = RoutingPad::Create ( net, plugOccurrence ); RoutingPad* rp = RoutingPad::create ( net, plugOccurrence );
rp->SetExternalComponent ( bestComponent ); rp->SetExternalComponent ( bestComponent );
return rp; return rp;
} }
RoutingPad* CreateRoutingPad ( Pin* pin ) RoutingPad* createRoutingPad ( Pin* pin )
// ************************************** // **************************************
{ {
Occurrence pinOccurrence ( pin, Path() ); Occurrence pinOccurrence ( pin, Path() );
@ -468,7 +468,7 @@ RoutingPad* CreateRoutingPad ( Pin* pin )
} }
# endif # endif
return RoutingPad::Create ( pin->getNet(), pinOccurrence ); return RoutingPad::create ( pin->getNet(), pinOccurrence );
} }

6
hurricane/src/hurricane/RoutingPad.h
View File

@ -47,7 +47,7 @@ class RoutingPad : public Component {
// ************ // ************
protected: RoutingPad(Net* net, const Point& p, Occurrence occurrence = Occurrence()); protected: RoutingPad(Net* net, const Point& p, Occurrence occurrence = Occurrence());
public: static RoutingPad* Create(Net* net, Occurrence occurrence); public: static RoutingPad* create(Net* net, Occurrence occurrence);
// Accessors // Accessors
// ********* // *********
@ -97,8 +97,8 @@ class RoutingPad : public Component {
}; };
RoutingPad* CreateRoutingPad ( Net* net, Occurrence plugOccurrence ); RoutingPad* createRoutingPad ( Net* net, Occurrence plugOccurrence );
RoutingPad* CreateRoutingPad ( Pin* pin ); RoutingPad* createRoutingPad ( Pin* pin );
} // End of Hurricane namespace. } // End of Hurricane namespace.

2
hurricane/src/hurricane/Rubber.cpp
View File

@ -122,7 +122,7 @@ void Rubber::Translate(const Unit& dx, const Unit& dy)
{ {
} }
Rubber* Rubber::_Create(Hook* hook) Rubber* Rubber::_create(Hook* hook)
// ******************************** // ********************************
{ {
if (!hook) if (!hook)

2
hurricane/src/hurricane/Rubber.h
View File

@ -72,7 +72,7 @@ class Rubber : public Go {
// Others // Others
// ****** // ******
public: static Rubber* _Create(Hook* hook); public: static Rubber* _create(Hook* hook);
protected: virtual void _postCreate(); protected: virtual void _postCreate();
public: void _destroy(); public: void _destroy();

2
hurricane/src/hurricane/Technology.cpp
View File

@ -108,7 +108,7 @@ Technology::Technology(DataBase* dataBase, const Name& name)
throw Error("Can't create " + _TName("Technology") + " : empty name"); throw Error("Can't create " + _TName("Technology") + " : empty name");
} }
Technology* Technology::Create(DataBase* dataBase, const Name& name) Technology* Technology::create(DataBase* dataBase, const Name& name)
// ***************************************************************** // *****************************************************************
{ {
Technology* technology = new Technology(dataBase, name); Technology* technology = new Technology(dataBase, name);

2
hurricane/src/hurricane/Technology.h
View File

@ -62,7 +62,7 @@ class Technology : public DBo {
protected: Technology(DataBase* dataBase, const Name& name); protected: Technology(DataBase* dataBase, const Name& name);
public: static Technology* Create(DataBase* dataBase, const Name& name); public: static Technology* create(DataBase* dataBase, const Name& name);
// Accessors // Accessors
// ********* // *********

4
hurricane/src/hurricane/Vertical.cpp
View File

@ -28,7 +28,7 @@ Vertical::Vertical(Net* net, Component* source, Component* target, Layer* layer,
{ {
} }
Vertical* Vertical::Create(Net* net, Layer* layer, const Unit& x, const Unit& width, const Unit& dySource, const Unit& dyTarget) Vertical* Vertical::create(Net* net, Layer* layer, const Unit& x, const Unit& width, const Unit& dySource, const Unit& dyTarget)
// **************************************************************************************************** // ****************************************************************************************************
{ {
if (!net) if (!net)
@ -41,7 +41,7 @@ Vertical* Vertical::Create(Net* net, Layer* layer, const Unit& x, const Unit& wi
return vertical; return vertical;
} }
Vertical* Vertical::Create(Component* source, Component* target, Layer* layer, const Unit& x, const Unit& width, const Unit& dySource, const Unit& dyTarget) Vertical* Vertical::create(Component* source, Component* target, Layer* layer, const Unit& x, const Unit& width, const Unit& dySource, const Unit& dyTarget)
// **************************************************************************************************** // ****************************************************************************************************
{ {
if (!source) if (!source)

4
hurricane/src/hurricane/Vertical.h
View File

@ -38,8 +38,8 @@ class Vertical : public Segment {
protected: Vertical(Net* net, Component* source, Component* target, Layer* layer, const Unit& x, const Unit& width = 0, const Unit& dySource = 0, const Unit& dyTarget = 0); protected: Vertical(Net* net, Component* source, Component* target, Layer* layer, const Unit& x, const Unit& width = 0, const Unit& dySource = 0, const Unit& dyTarget = 0);
public: static Vertical* Create(Net* net, Layer* layer, const Unit& x, const Unit& width = 0, const Unit& dySource = 0, const Unit& dyTarget = 0); public: static Vertical* create(Net* net, Layer* layer, const Unit& x, const Unit& width = 0, const Unit& dySource = 0, const Unit& dyTarget = 0);
public: static Vertical* Create(Component* source, Component* target, Layer* layer, const Unit& x, const Unit& width = 0, const Unit& dySource = 0, const Unit& dyTarget = 0); public: static Vertical* create(Component* source, Component* target, Layer* layer, const Unit& x, const Unit& width = 0, const Unit& dySource = 0, const Unit& dyTarget = 0);
// Accessors // Accessors
// ********* // *********

6
hurricane/src/pyext/ProxyProperty.cpp
View File

@ -122,14 +122,14 @@ ProxyProperty::ProxyProperty ( void* shadow )
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Constructor : "ProxyProperty::Create ()". // Constructor : "ProxyProperty::create ()".
ProxyProperty* ProxyProperty::create ( void* shadow ) ProxyProperty* ProxyProperty::create ( void* shadow )
{ {
ProxyProperty* property = new ProxyProperty ( shadow ); ProxyProperty* property = new ProxyProperty ( shadow );
if ( property == NULL ) if ( property == NULL )
throw Error ( "ProxyProperty::Create()" ); throw Error ( "ProxyProperty::create()" );
return ( property ); return ( property );
} }
@ -141,7 +141,7 @@ ProxyProperty* ProxyProperty::create ( void* shadow )
// Destructor : "ProxyProperty::_preDestroy ()". // Destructor : "ProxyProperty::_preDestroy ()".
void ProxyProperty::_preDestroy () { void ProxyProperty::_preDestroy () {
if ( _owner ) _owner->_onDeleted ( this ); if ( _owner ) _owner->_onDestroyed ( this );
trace << "ProxyProperty::_owner := " << hex << (void*)_owner << endl; trace << "ProxyProperty::_owner := " << hex << (void*)_owner << endl;

2
hurricane/src/pyext/PyCell.cpp
View File

@ -659,7 +659,7 @@ extern "C" {
Cell* cell = NULL; Cell* cell = NULL;
HTRY HTRY
cell = Cell::Create(PYLIBRARY_O(arg0), getString(*PYNAME_O(arg1))); cell = Cell::create(PYLIBRARY_O(arg0), getString(*PYNAME_O(arg1)));
HCATCH HCATCH
return PyCell_Link(cell); return PyCell_Link(cell);

12
hurricane/src/pyext/PyContact.cpp
View File

@ -152,20 +152,20 @@ extern "C" {
//cerr << "Format := " << __cs.getObjectIds() << endl; //cerr << "Format := " << __cs.getObjectIds() << endl;
if ( __cs.getObjectIds() == NET_LAYER_INTS2_ARG ) if ( __cs.getObjectIds() == NET_LAYER_INTS2_ARG )
contact = Contact::Create ( PYNET_O(arg0) contact = Contact::create ( PYNET_O(arg0)
, PYLAYER_O(arg1) , PYLAYER_O(arg1)
, PyInt_AsLong(arg2) , PyInt_AsLong(arg2)
, PyInt_AsLong(arg3) ); , PyInt_AsLong(arg3) );
else if ( __cs.getObjectIds() == NET_LAYER_INTS3_ARG ) else if ( __cs.getObjectIds() == NET_LAYER_INTS3_ARG )
contact = Contact::Create ( PYNET_O(arg0) contact = Contact::create ( PYNET_O(arg0)
, PYLAYER_O(arg1) , PYLAYER_O(arg1)
, PyInt_AsLong(arg2) , PyInt_AsLong(arg2)
, PyInt_AsLong(arg3) , PyInt_AsLong(arg3)
, PyInt_AsLong(arg4) ); , PyInt_AsLong(arg4) );
else if ( __cs.getObjectIds() == NET_LAYER_INTS4_ARG ) else if ( __cs.getObjectIds() == NET_LAYER_INTS4_ARG )
contact = Contact::Create ( PYNET_O(arg0) contact = Contact::create ( PYNET_O(arg0)
, PYLAYER_O(arg1) , PYLAYER_O(arg1)
, PyInt_AsLong(arg2) , PyInt_AsLong(arg2)
, PyInt_AsLong(arg3) , PyInt_AsLong(arg3)
@ -173,20 +173,20 @@ extern "C" {
, PyInt_AsLong(arg5) ); , PyInt_AsLong(arg5) );
else if ( __cs.getObjectIds() == COMP_LAYER_INTS2_ARG ) else if ( __cs.getObjectIds() == COMP_LAYER_INTS2_ARG )
contact = Contact::Create ( PYCOMPONENT_O(arg0) contact = Contact::create ( PYCOMPONENT_O(arg0)
, PYLAYER_O(arg1) , PYLAYER_O(arg1)
, PyInt_AsLong(arg2) , PyInt_AsLong(arg2)
, PyInt_AsLong(arg3) ); , PyInt_AsLong(arg3) );
else if ( __cs.getObjectIds() == COMP_LAYER_INTS3_ARG ) else if ( __cs.getObjectIds() == COMP_LAYER_INTS3_ARG )
contact = Contact::Create ( PYCOMPONENT_O(arg0) contact = Contact::create ( PYCOMPONENT_O(arg0)
, PYLAYER_O(arg1) , PYLAYER_O(arg1)
, PyInt_AsLong(arg2) , PyInt_AsLong(arg2)
, PyInt_AsLong(arg3) , PyInt_AsLong(arg3)
, PyInt_AsLong(arg4) ); , PyInt_AsLong(arg4) );
else if ( __cs.getObjectIds() == COMP_LAYER_INTS4_ARG ) else if ( __cs.getObjectIds() == COMP_LAYER_INTS4_ARG )
contact = Contact::Create ( PYCOMPONENT_O(arg0) contact = Contact::create ( PYCOMPONENT_O(arg0)
, PYLAYER_O(arg1) , PYLAYER_O(arg1)
, PyInt_AsLong(arg2) , PyInt_AsLong(arg2)
, PyInt_AsLong(arg3) , PyInt_AsLong(arg3)

2
hurricane/src/pyext/PyDataBase.cpp
View File

@ -153,7 +153,7 @@ extern "C" {
DataBase* db = NULL; DataBase* db = NULL;
HTRY HTRY
db = DataBase::Create (); db = DataBase::create ();
HCATCH HCATCH
return PyDataBase_Link(db); return PyDataBase_Link(db);

20
hurricane/src/pyext/PyHorizontal.cpp
View File

@ -122,8 +122,8 @@ extern "C" {
HTRY HTRY
__cs.Init ("Horizontal.Create"); __cs.Init ("Horizontal.create");
if ( ! PyArg_ParseTuple(args,"O&O&O&|O&O&O&O&:Horizontal.Create" if ( ! PyArg_ParseTuple(args,"O&O&O&|O&O&O&O&:Horizontal.create"
,Converter,&arg0 ,Converter,&arg0
,Converter,&arg1 ,Converter,&arg1
,Converter,&arg2 ,Converter,&arg2
@ -134,47 +134,47 @@ extern "C" {
) ) return ( NULL ); ) ) return ( NULL );
if ( __cs.getObjectIds() == NET_LAYER_INT_ARG ) if ( __cs.getObjectIds() == NET_LAYER_INT_ARG )
horizontal = Horizontal::Create ( PYNET_O(arg0) horizontal = Horizontal::create ( PYNET_O(arg0)
, PYLAYER_O(arg1) , PYLAYER_O(arg1)
, PyInt_AsLong(arg2) ); , PyInt_AsLong(arg2) );
else if ( __cs.getObjectIds() == NET_LAYER_INTS2_ARG ) else if ( __cs.getObjectIds() == NET_LAYER_INTS2_ARG )
horizontal = Horizontal::Create ( PYNET_O(arg0) horizontal = Horizontal::create ( PYNET_O(arg0)
, PYLAYER_O(arg1) , PYLAYER_O(arg1)
, PyInt_AsLong(arg2) , PyInt_AsLong(arg2)
, PyInt_AsLong(arg3) ); , PyInt_AsLong(arg3) );
else if ( __cs.getObjectIds() == COMPS2_LAYER_INT_ARG ) else if ( __cs.getObjectIds() == COMPS2_LAYER_INT_ARG )
horizontal = Horizontal::Create ( ComponentCast(arg0) horizontal = Horizontal::create ( ComponentCast(arg0)
, ComponentCast(arg1) , ComponentCast(arg1)
, PYLAYER_O(arg2) , PYLAYER_O(arg2)
, PyInt_AsLong(arg3) ); , PyInt_AsLong(arg3) );
else if ( __cs.getObjectIds() == NET_LAYER_INTS3_ARG ) else if ( __cs.getObjectIds() == NET_LAYER_INTS3_ARG )
horizontal = Horizontal::Create ( PYNET_O(arg0) horizontal = Horizontal::create ( PYNET_O(arg0)
, PYLAYER_O(arg1) , PYLAYER_O(arg1)
, PyInt_AsLong(arg2) , PyInt_AsLong(arg2)
, PyInt_AsLong(arg3) , PyInt_AsLong(arg3)
, PyInt_AsLong(arg4) ); , PyInt_AsLong(arg4) );
else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS2_ARG ) else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS2_ARG )
horizontal = Horizontal::Create ( ComponentCast(arg0) horizontal = Horizontal::create ( ComponentCast(arg0)
, ComponentCast(arg1) , ComponentCast(arg1)
, PYLAYER_O(arg2) , PYLAYER_O(arg2)
, PyInt_AsLong(arg3) , PyInt_AsLong(arg3)
, PyInt_AsLong(arg4) ); , PyInt_AsLong(arg4) );
else if ( __cs.getObjectIds() == NET_LAYER_INTS4_ARG ) else if ( __cs.getObjectIds() == NET_LAYER_INTS4_ARG )
horizontal = Horizontal::Create ( PYNET_O(arg0) horizontal = Horizontal::create ( PYNET_O(arg0)
, PYLAYER_O(arg1) , PYLAYER_O(arg1)
, PyInt_AsLong(arg2) , PyInt_AsLong(arg2)
, PyInt_AsLong(arg3) , PyInt_AsLong(arg3)
, PyInt_AsLong(arg4) , PyInt_AsLong(arg4)
, PyInt_AsLong(arg5) ); , PyInt_AsLong(arg5) );
else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS3_ARG ) else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS3_ARG )
horizontal = Horizontal::Create ( ComponentCast(arg0) horizontal = Horizontal::create ( ComponentCast(arg0)
, ComponentCast(arg1) , ComponentCast(arg1)
, PYLAYER_O(arg2) , PYLAYER_O(arg2)
, PyInt_AsLong(arg3) , PyInt_AsLong(arg3)
, PyInt_AsLong(arg4) , PyInt_AsLong(arg4)
, PyInt_AsLong(arg5) ); , PyInt_AsLong(arg5) );
else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS4_ARG ) else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS4_ARG )
horizontal = Horizontal::Create ( ComponentCast(arg0) horizontal = Horizontal::create ( ComponentCast(arg0)
, ComponentCast(arg1) , ComponentCast(arg1)
, PYLAYER_O(arg2) , PYLAYER_O(arg2)
, PyInt_AsLong(arg3) , PyInt_AsLong(arg3)

2
hurricane/src/pyext/PyHurricane.h
View File

@ -694,7 +694,7 @@ extern "C" {
Cell* cell = PYCELL_O(arg0); \ Cell* cell = PYCELL_O(arg0); \
cengine = dynamic_cast<CENGINE*>(getCEngine(cell, Name(#CENGINE))); \ cengine = dynamic_cast<CENGINE*>(getCEngine(cell, Name(#CENGINE))); \
if (!cengine) { \ if (!cengine) { \
cengine = CENGINE::Create (cell); \ cengine = CENGINE::create (cell); \
} \ } \
HCATCH \ HCATCH \
return Py##CENGINE##_Link( cengine ); \ return Py##CENGINE##_Link( cengine ); \

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

@ -165,7 +165,7 @@ extern "C" {
// | "PyHyperNet" Object Methods | // | "PyHyperNet" Object Methods |
// x-------------------------------------------------------------x // x-------------------------------------------------------------x
// --------------------------------------------------------------- // ---------------------------------------------------------------
// Attribute Method : "PyHyperNet_Create ()" // Attribute Method : "PyHyperNet_new ()"
static PyObject* PyHyperNet_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { static PyObject* PyHyperNet_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
trace << "PyHyperNet_new()" << endl; trace << "PyHyperNet_new()" << endl;

4
hurricane/src/pyext/PyInstance.cpp
View File

@ -472,10 +472,10 @@ extern "C" {
,Converter,&arg3 ,Converter,&arg3
) ) return ( NULL ); ) ) return ( NULL );
if ( __cs.getObjectIds() == CELL_NAME_CELL_ARG ) { instance = Instance::Create ( PYCELL_O(arg0) if ( __cs.getObjectIds() == CELL_NAME_CELL_ARG ) { instance = Instance::create ( PYCELL_O(arg0)
, *PYNAME_O(arg1) , *PYNAME_O(arg1)
, PYCELL_O(arg2) ); } , PYCELL_O(arg2) ); }
else if ( __cs.getObjectIds() == CELL_NAME_CELL_TRANS_ARG ) { instance = Instance::Create ( PYCELL_O(arg0) else if ( __cs.getObjectIds() == CELL_NAME_CELL_TRANS_ARG ) { instance = Instance::create ( PYCELL_O(arg0)
, *PYNAME_O(arg1) , *PYNAME_O(arg1)
, PYCELL_O(arg2) , PYCELL_O(arg2)
, *PYTRANSFORMATION_O(arg3) , *PYTRANSFORMATION_O(arg3)

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

@ -179,12 +179,12 @@ extern "C" {
if (ParseTwoArg("Library.new", args, ":db:name", &arg0, &arg1)) { if (ParseTwoArg("Library.new", args, ":db:name", &arg0, &arg1)) {
HTRY HTRY
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 HCATCH
} else if (ParseTwoArg("Library.new", args, ":db:name", &arg0, &arg1)) { } else if (ParseTwoArg("Library.new", args, ":db:name", &arg0, &arg1)) {
HTRY 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 HCATCH
} else { } else {
return NULL; return NULL;

2
hurricane/src/pyext/PyNet.cpp
View File

@ -588,7 +588,7 @@ extern "C" {
if ( ! ParseTwoArg ( "Net.new", args, CELL_NAME_ARG, &arg0, &arg1 ) ) return ( NULL ); if ( ! ParseTwoArg ( "Net.new", args, CELL_NAME_ARG, &arg0, &arg1 ) ) return ( NULL );
HTRY HTRY
net = Net::Create ( PYCELL_O(arg0), *PYNAME_O(arg1) ); net = Net::create ( PYCELL_O(arg0), *PYNAME_O(arg1) );
HCATCH HCATCH
return PyNet_Link ( net ); return PyNet_Link ( net );

8
hurricane/src/pyext/PyNetLocator.cpp
View File

@ -78,14 +78,6 @@ extern "C" {
// x-------------------------------------------------------------x // x-------------------------------------------------------------x
// ---------------------------------------------------------------
// Attribute Method : "PyNetLocator_Create ()"
// Standart Accessors (Attributes).
// Standart Predicates (Attributes). // Standart Predicates (Attributes).
DirectGetBoolAttribute(PyNetLocator_IsValid,IsValid,PyNetLocator,Locator<Net*>) DirectGetBoolAttribute(PyNetLocator_IsValid,IsValid,PyNetLocator,Locator<Net*>)

6
hurricane/src/pyext/PyPin.cpp
View File

@ -188,7 +188,7 @@ extern "C" {
string pin_arg1 = ":ent:name:int:int:layer:int:int:int:int"; string pin_arg1 = ":ent:name:int:int:layer:int:int:int:int";
string pin_arg2 = ":ent:name:int:int:layer:int:int:int"; string pin_arg2 = ":ent:name:int:int:layer:int:int:int";
string pin_arg3 = ":ent:name:int:int:layer:int:int"; string pin_arg3 = ":ent:name:int:int:layer:int:int";
if ( __cs.getObjectIds() == pin_arg1 ) { pin = Pin::Create ( PYNET_O ( arg0 ) if ( __cs.getObjectIds() == pin_arg1 ) { pin = Pin::create ( PYNET_O ( arg0 )
, *PYNAME_O ( arg1 ) , *PYNAME_O ( arg1 )
, PyInt_AsAccessDirection ( arg2 ) , PyInt_AsAccessDirection ( arg2 )
, PyInt_AsPlacementStatus ( arg3 ) , PyInt_AsPlacementStatus ( arg3 )
@ -197,7 +197,7 @@ extern "C" {
, PyInt_AsLong ( arg6 ) , PyInt_AsLong ( arg6 )
, PyInt_AsLong ( arg7 ) , PyInt_AsLong ( arg7 )
, PyInt_AsLong ( arg8 ) ); } , PyInt_AsLong ( arg8 ) ); }
else if ( __cs.getObjectIds() == pin_arg2 ) { pin = Pin::Create ( PYNET_O ( arg0 ) else if ( __cs.getObjectIds() == pin_arg2 ) { pin = Pin::create ( PYNET_O ( arg0 )
, *PYNAME_O ( arg1 ) , *PYNAME_O ( arg1 )
, PyInt_AsAccessDirection ( arg2 ) , PyInt_AsAccessDirection ( arg2 )
, PyInt_AsPlacementStatus ( arg3 ) , PyInt_AsPlacementStatus ( arg3 )
@ -205,7 +205,7 @@ extern "C" {
, PyInt_AsLong ( arg5 ) , PyInt_AsLong ( arg5 )
, PyInt_AsLong ( arg6 ) , PyInt_AsLong ( arg6 )
, PyInt_AsLong ( arg7 ) ); } , PyInt_AsLong ( arg7 ) ); }
else if ( __cs.getObjectIds() == pin_arg3 ) { pin = Pin::Create ( PYNET_O ( arg0 ) else if ( __cs.getObjectIds() == pin_arg3 ) { pin = Pin::create ( PYNET_O ( arg0 )
, *PYNAME_O ( arg1 ) , *PYNAME_O ( arg1 )
, PyInt_AsAccessDirection ( arg2 ) , PyInt_AsAccessDirection ( arg2 )
, PyInt_AsPlacementStatus ( arg3 ) , PyInt_AsPlacementStatus ( arg3 )

4
hurricane/src/pyext/PyPoint.cpp
View File

@ -145,8 +145,8 @@ extern "C" {
PyObject* arg0; PyObject* arg0;
PyObject* arg1; PyObject* arg1;
__cs.Init ("Point.Create"); __cs.Init ("Point.create");
if ( ! PyArg_ParseTuple(args,"|O&O&:Point.Create" if ( ! PyArg_ParseTuple(args,"|O&O&:Point.create"
,Converter,&arg0 ,Converter,&arg0
,Converter,&arg1 ,Converter,&arg1
) ) return ( NULL ); ) ) return ( NULL );

4
hurricane/src/pyext/PyReference.cpp
View File

@ -207,12 +207,12 @@ extern "C" {
) ) return ( NULL ); ) ) return ( NULL );
if ( __cs.getObjectIds() == CELL_NAME_INTS2_ARG ) if ( __cs.getObjectIds() == CELL_NAME_INTS2_ARG )
reference = Reference::Create ( PYCELL_O(arg0) reference = Reference::create ( PYCELL_O(arg0)
, *PYNAME_O(arg1) , *PYNAME_O(arg1)
, PyInt_AsLong(arg2) , PyInt_AsLong(arg2)
, PyInt_AsLong(arg3) ); , PyInt_AsLong(arg3) );
else if ( __cs.getObjectIds() == CELL_NAME_POINT_ARG ) else if ( __cs.getObjectIds() == CELL_NAME_POINT_ARG )
reference = Reference::Create ( PYCELL_O(arg0) reference = Reference::create ( PYCELL_O(arg0)
, *PYNAME_O(arg1) , *PYNAME_O(arg1)
, *PYPOINT_O(arg2) ); , *PYPOINT_O(arg2) );
else { else {

16
hurricane/src/pyext/PyVertical.cpp
View File

@ -133,47 +133,47 @@ extern "C" {
//cerr << "Format := " << __cs.getObjectIds() << endl; //cerr << "Format := " << __cs.getObjectIds() << endl;
if ( __cs.getObjectIds() == NET_LAYER_INT_ARG ) if ( __cs.getObjectIds() == NET_LAYER_INT_ARG )
vertical = Vertical::Create ( PYNET_O(arg0) vertical = Vertical::create ( PYNET_O(arg0)
, PYLAYER_O(arg1) , PYLAYER_O(arg1)
, PyInt_AsLong(arg2) ); , PyInt_AsLong(arg2) );
else if ( __cs.getObjectIds() == NET_LAYER_INTS2_ARG ) else if ( __cs.getObjectIds() == NET_LAYER_INTS2_ARG )
vertical = Vertical::Create ( PYNET_O(arg0) vertical = Vertical::create ( PYNET_O(arg0)
, PYLAYER_O(arg1) , PYLAYER_O(arg1)
, PyInt_AsLong(arg2) , PyInt_AsLong(arg2)
, PyInt_AsLong(arg3) ); , PyInt_AsLong(arg3) );
else if ( __cs.getObjectIds() == COMPS2_LAYER_INT_ARG ) else if ( __cs.getObjectIds() == COMPS2_LAYER_INT_ARG )
vertical = Vertical::Create ( ComponentCast(arg0) vertical = Vertical::create ( ComponentCast(arg0)
, ComponentCast(arg1) , ComponentCast(arg1)
, PYLAYER_O(arg2) , PYLAYER_O(arg2)
, PyInt_AsLong(arg3) ); , PyInt_AsLong(arg3) );
else if ( __cs.getObjectIds() == NET_LAYER_INTS3_ARG ) else if ( __cs.getObjectIds() == NET_LAYER_INTS3_ARG )
vertical = Vertical::Create ( PYNET_O(arg0) vertical = Vertical::create ( PYNET_O(arg0)
, PYLAYER_O(arg1) , PYLAYER_O(arg1)
, PyInt_AsLong(arg2) , PyInt_AsLong(arg2)
, PyInt_AsLong(arg3) , PyInt_AsLong(arg3)
, PyInt_AsLong(arg4) ); , PyInt_AsLong(arg4) );
else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS2_ARG ) else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS2_ARG )
vertical = Vertical::Create ( ComponentCast(arg0) vertical = Vertical::create ( ComponentCast(arg0)
, ComponentCast(arg1) , ComponentCast(arg1)
, PYLAYER_O(arg2) , PYLAYER_O(arg2)
, PyInt_AsLong(arg3) , PyInt_AsLong(arg3)
, PyInt_AsLong(arg4) ); , PyInt_AsLong(arg4) );
else if ( __cs.getObjectIds() == NET_LAYER_INTS4_ARG ) else if ( __cs.getObjectIds() == NET_LAYER_INTS4_ARG )
vertical = Vertical::Create ( PYNET_O(arg0) vertical = Vertical::create ( PYNET_O(arg0)
, PYLAYER_O(arg1) , PYLAYER_O(arg1)
, PyInt_AsLong(arg2) , PyInt_AsLong(arg2)
, PyInt_AsLong(arg3) , PyInt_AsLong(arg3)
, PyInt_AsLong(arg4) , PyInt_AsLong(arg4)
, PyInt_AsLong(arg5) ); , PyInt_AsLong(arg5) );
else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS3_ARG ) else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS3_ARG )
vertical = Vertical::Create ( ComponentCast(arg0) vertical = Vertical::create ( ComponentCast(arg0)
, ComponentCast(arg1) , ComponentCast(arg1)
, PYLAYER_O(arg2) , PYLAYER_O(arg2)
, PyInt_AsLong(arg3) , PyInt_AsLong(arg3)
, PyInt_AsLong(arg4) , PyInt_AsLong(arg4)
, PyInt_AsLong(arg5) ); , PyInt_AsLong(arg5) );
else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS4_ARG ) else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS4_ARG )
vertical = Vertical::Create ( ComponentCast(arg0) vertical = Vertical::create ( ComponentCast(arg0)
, ComponentCast(arg1) , ComponentCast(arg1)
, PYLAYER_O(arg2) , PYLAYER_O(arg2)
, PyInt_AsLong(arg3) , PyInt_AsLong(arg3)