diff --git a/hurricane/src/hurricane/BasicLayer.cpp b/hurricane/src/hurricane/BasicLayer.cpp index 2f475a65..03fe48ea 100644 --- a/hurricane/src/hurricane/BasicLayer.cpp +++ b/hurricane/src/hurricane/BasicLayer.cpp @@ -40,9 +40,9 @@ class BasicLayer_BasicLayers : public Collection { public: virtual BasicLayer* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -288,13 +288,13 @@ Locator* BasicLayer_BasicLayers::Locator::getClone() const return new Locator(*this); } -bool BasicLayer_BasicLayers::Locator::IsValid() const +bool BasicLayer_BasicLayers::Locator::isValid() const // ************************************************** { return (_basicLayer != NULL); } -void BasicLayer_BasicLayers::Locator::Progress() +void BasicLayer_BasicLayers::Locator::progress() // ********************************************* { _basicLayer = NULL; diff --git a/hurricane/src/hurricane/BasicLayers.h b/hurricane/src/hurricane/BasicLayers.h index fa8e1ffd..d9f46392 100644 --- a/hurricane/src/hurricane/BasicLayers.h +++ b/hurricane/src/hurricane/BasicLayers.h @@ -47,9 +47,9 @@ typedef GenericFilter BasicLayerFilter; /****************************************************/\ {\ BasicLayerLocator _locator = basicLayers.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ BasicLayer* basicLayer = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Boxes.h b/hurricane/src/hurricane/Boxes.h index cbf0c151..f9c12248 100644 --- a/hurricane/src/hurricane/Boxes.h +++ b/hurricane/src/hurricane/Boxes.h @@ -46,9 +46,9 @@ typedef GenericFilter BoxFilter; /*******************************/\ {\ BoxLocator _locator = boxes.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Box box = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/CellCollections.cpp b/hurricane/src/hurricane/CellCollections.cpp index b0c9bdfe..77fa6931 100644 --- a/hurricane/src/hurricane/CellCollections.cpp +++ b/hurricane/src/hurricane/CellCollections.cpp @@ -41,9 +41,9 @@ class Cell_Slices : public Collection { public: virtual Slice* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -114,9 +114,9 @@ class Cell_Components : public Collection { public: virtual Component* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -188,9 +188,9 @@ class Cell_ComponentsUnder : public Collection { public: virtual Component* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -265,9 +265,9 @@ class Cell_Occurrences : public Collection { public: virtual Occurrence getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -342,9 +342,9 @@ class Cell_OccurrencesUnder : public Collection { public: virtual Occurrence getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -413,9 +413,9 @@ class Cell_LeafInstanceOccurrences : public Collection { public: virtual Occurrence getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -485,9 +485,9 @@ class Cell_LeafInstanceOccurrencesUnder : public Collection { public: virtual Occurrence getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -557,9 +557,9 @@ class Cell_TerminalInstanceOccurrences : public Collection { public: virtual Occurrence getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -629,9 +629,9 @@ class Cell_TerminalInstanceOccurrencesUnder : public Collection { public: virtual Occurrence getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -703,9 +703,9 @@ class Cell_ComponentOccurrences : public Collection { public: virtual Occurrence getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -778,9 +778,9 @@ class Cell_ComponentOccurrencesUnder : public Collection { public: virtual Occurrence getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -849,9 +849,9 @@ class Cell_HyperNetRootNetOccurrences : public Collection { public: virtual Occurrence getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -920,9 +920,9 @@ class Cell_HyperNetRootNetOccurrences : public Collection { // public: virtual MainView* getElement() const; // public: virtual Hurricane::Locator* getClone() const; // -// public: virtual bool IsValid() const; +// public: virtual bool isValid() const; // -// public: virtual void Progress(); +// public: virtual void progress(); // // public: virtual string _getString() const; // @@ -986,9 +986,9 @@ class Cell_SubCells : public Collection { public: virtual Cell* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -1052,8 +1052,8 @@ class Cell_SubCells : public Collection { public: virtual Path getElement () const { return _instancePath; }; virtual Hurricane::Locator* getClone () const { return new Locator(*this); }; - virtual bool IsValid () const { return _instancesStack.size(); }; - virtual void Progress (); + virtual bool isValid () const { return _instancesStack.size(); }; + virtual void progress (); // Hurricane Managment. public: virtual string _getString() const; @@ -1451,8 +1451,8 @@ Cell_Slices::Locator::Locator(const Cell* cell, const Layer::Mask& mask) { if (_cell && (_mask != 0)) { _sliceLocator = ((Cell*)_cell)->_getSliceMap().getElements().getLocator(); - while (_sliceLocator.IsValid() && !(_sliceLocator.getElement()->getLayer()->getMask() & _mask)) - _sliceLocator.Progress(); + while (_sliceLocator.isValid() && !(_sliceLocator.getElement()->getLayer()->getMask() & _mask)) + _sliceLocator.progress(); } } @@ -1486,20 +1486,20 @@ Locator* Cell_Slices::Locator::getClone() const return new Locator(*this); } -bool Cell_Slices::Locator::IsValid() const +bool Cell_Slices::Locator::isValid() const // *************************************** { - return _sliceLocator.IsValid(); + return _sliceLocator.isValid(); } -void Cell_Slices::Locator::Progress() +void Cell_Slices::Locator::progress() // ********************************** { - if (_sliceLocator.IsValid()) { + if (_sliceLocator.isValid()) { do { - _sliceLocator.Progress(); + _sliceLocator.progress(); } - while (_sliceLocator.IsValid() && !(_sliceLocator.getElement()->getLayer()->getMask() & _mask)); + while (_sliceLocator.isValid() && !(_sliceLocator.getElement()->getLayer()->getMask() & _mask)); } } @@ -1605,16 +1605,16 @@ Cell_Components::Locator::Locator(const Cell* cell, const Layer::Mask& mask) { if (_cell && (_mask != 0)) { _sliceLocator = _cell->getSlices(_mask).getLocator(); - while (!_component && _sliceLocator.IsValid()) { + while (!_component && _sliceLocator.isValid()) { Slice* slice = _sliceLocator.getElement(); if (slice) { _componentLocator = slice->getComponents().getLocator(); - while (!_component && _componentLocator.IsValid()) { + while (!_component && _componentLocator.isValid()) { _component = _componentLocator.getElement(); - if (!_component) _componentLocator.Progress(); + if (!_component) _componentLocator.progress(); } } - if (!_component) _sliceLocator.Progress(); + if (!_component) _sliceLocator.progress(); } } } @@ -1653,35 +1653,35 @@ Locator* Cell_Components::Locator::getClone() const return new Locator(*this); } -bool Cell_Components::Locator::IsValid() const +bool Cell_Components::Locator::isValid() const // ******************************************* { return (_component != NULL); } -void Cell_Components::Locator::Progress() +void Cell_Components::Locator::progress() // ************************************** { if (_component) { _component = NULL; do { - _componentLocator.Progress(); + _componentLocator.progress(); _component = _componentLocator.getElement(); } - while (!_component && _componentLocator.IsValid()); + while (!_component && _componentLocator.isValid()); if (!_component) { do { - _sliceLocator.Progress(); + _sliceLocator.progress(); Slice* slice = _sliceLocator.getElement(); if (slice) { _componentLocator = slice->getComponents().getLocator(); - while (!_component && _componentLocator.IsValid()) { + while (!_component && _componentLocator.isValid()) { _component = _componentLocator.getElement(); - if (!_component) _componentLocator.Progress(); + if (!_component) _componentLocator.progress(); } } } - while (!_component && _sliceLocator.IsValid()); + while (!_component && _sliceLocator.isValid()); } } } @@ -1795,14 +1795,14 @@ Cell_ComponentsUnder::Locator::Locator(const Cell* cell, const Box& area, const { if (_cell && !_area.isEmpty()) { _sliceLocator = _cell->getSlices(_mask).getLocator(); - while (!_component && _sliceLocator.IsValid()) { + while (!_component && _sliceLocator.isValid()) { Slice* slice = _sliceLocator.getElement(); if (slice) { _componentLocator = slice->getComponentsUnder(_area).getLocator(); - if (_componentLocator.IsValid()) + if (_componentLocator.isValid()) _component = _componentLocator.getElement(); } - if (!_component) _sliceLocator.Progress(); + if (!_component) _sliceLocator.progress(); } } } @@ -1843,30 +1843,30 @@ Locator* Cell_ComponentsUnder::Locator::getClone() const return new Locator(*this); } -bool Cell_ComponentsUnder::Locator::IsValid() const +bool Cell_ComponentsUnder::Locator::isValid() const // ************************************************ { return (_component != NULL); } -void Cell_ComponentsUnder::Locator::Progress() +void Cell_ComponentsUnder::Locator::progress() // ******************************************* { if (_component) { _component = NULL; - _componentLocator.Progress(); - if (_componentLocator.IsValid()) + _componentLocator.progress(); + if (_componentLocator.isValid()) _component = _componentLocator.getElement(); else { do { - _sliceLocator.Progress(); + _sliceLocator.progress(); Slice* slice = _sliceLocator.getElement(); if (slice) { _componentLocator = slice->getComponentsUnder(_area).getLocator(); - if (_componentLocator.IsValid()) + if (_componentLocator.isValid()) _component = _componentLocator.getElement(); } - } while (!_component && _sliceLocator.IsValid()); + } while (!_component && _sliceLocator.isValid()); } } } @@ -1980,19 +1980,19 @@ Cell_Occurrences::Locator::Locator(const Cell* cell, unsigned searchDepth) { if (_cell) { _componentLocator = _cell->getComponents().getLocator(); - if (_componentLocator.IsValid()) + if (_componentLocator.isValid()) _state = 1; else { _rubberLocator = _cell->getRubbers().getLocator(); - if (_rubberLocator.IsValid()) + if (_rubberLocator.isValid()) _state = 2; else { _markerLocator = _cell->getMarkers().getLocator(); - if (_markerLocator.IsValid()) + if (_markerLocator.isValid()) _state = 3; else { _instanceLocator = _cell->getInstances().getLocator(); - if (_instanceLocator.IsValid()) + if (_instanceLocator.isValid()) _state = 4; } } @@ -2054,30 +2054,30 @@ Locator* Cell_Occurrences::Locator::getClone() const return new Locator(*this); } -bool Cell_Occurrences::Locator::IsValid() const +bool Cell_Occurrences::Locator::isValid() const // ******************************************* { return (_state != 0); } -void Cell_Occurrences::Locator::Progress() +void Cell_Occurrences::Locator::progress() // ************************************** { if (_state) { switch (_state) { case 1 : - _componentLocator.Progress(); - if (!_componentLocator.IsValid()) { + _componentLocator.progress(); + if (!_componentLocator.isValid()) { _rubberLocator = _cell->getRubbers().getLocator(); - if (_rubberLocator.IsValid()) + if (_rubberLocator.isValid()) _state = 2; else { _markerLocator = _cell->getMarkers().getLocator(); - if (_markerLocator.IsValid()) + if (_markerLocator.isValid()) _state = 3; else { _instanceLocator = _cell->getInstances().getLocator(); - if (_instanceLocator.IsValid()) + if (_instanceLocator.isValid()) _state = 4; else _state = 0; @@ -2086,14 +2086,14 @@ void Cell_Occurrences::Locator::Progress() } break; case 2 : - _rubberLocator.Progress(); - if (!_rubberLocator.IsValid()) { + _rubberLocator.progress(); + if (!_rubberLocator.isValid()) { _markerLocator = _cell->getMarkers().getLocator(); - if (_markerLocator.IsValid()) + if (_markerLocator.isValid()) _state = 3; else { _instanceLocator = _cell->getInstances().getLocator(); - if (_instanceLocator.IsValid()) + if (_instanceLocator.isValid()) _state = 4; else _state = 0; @@ -2101,10 +2101,10 @@ void Cell_Occurrences::Locator::Progress() } break; case 3 : - _markerLocator.Progress(); - if (!_markerLocator.IsValid()) { + _markerLocator.progress(); + if (!_markerLocator.isValid()) { _instanceLocator = _cell->getInstances().getLocator(); - if (_instanceLocator.IsValid()) + if (_instanceLocator.isValid()) _state = 4; else _state = 0; @@ -2112,32 +2112,32 @@ void Cell_Occurrences::Locator::Progress() break; case 4 : if (!_searchDepth) { - _instanceLocator.Progress(); - if (!_instanceLocator.IsValid()) _state = 0; + _instanceLocator.progress(); + if (!_instanceLocator.isValid()) _state = 0; } else { Instance* instance = _instanceLocator.getElement(); if (instance->IsTerminal()) { - _instanceLocator.Progress(); - if (!_instanceLocator.IsValid()) _state = 0; + _instanceLocator.progress(); + if (!_instanceLocator.isValid()) _state = 0; } else { _occurrenceLocator = instance->getMasterCell()->getOccurrences(_searchDepth - 1).getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 5; else { - _instanceLocator.Progress(); - if (!_instanceLocator.IsValid()) _state = 0; + _instanceLocator.progress(); + if (!_instanceLocator.isValid()) _state = 0; } } } break; case 5 : - _occurrenceLocator.Progress(); - if (!_occurrenceLocator.IsValid()) { - _instanceLocator.Progress(); - if (_instanceLocator.IsValid()) + _occurrenceLocator.progress(); + if (!_occurrenceLocator.isValid()) { + _instanceLocator.progress(); + if (_instanceLocator.isValid()) _state = 4; else _state = 0; @@ -2262,19 +2262,19 @@ Cell_OccurrencesUnder::Locator::Locator(const Cell* cell, const Box& area, unsig { if (_cell && !_area.isEmpty()) { _componentLocator = _cell->getComponentsUnder(_area).getLocator(); - if (_componentLocator.IsValid()) + if (_componentLocator.isValid()) _state = 1; else { _rubberLocator = _cell->getRubbersUnder(_area).getLocator(); - if (_rubberLocator.IsValid()) + if (_rubberLocator.isValid()) _state = 2; else { _markerLocator = _cell->getMarkersUnder(_area).getLocator(); - if (_markerLocator.IsValid()) + if (_markerLocator.isValid()) _state = 3; else { _instanceLocator = _cell->getInstancesUnder(_area).getLocator(); - if (_instanceLocator.IsValid()) + if (_instanceLocator.isValid()) _state = 4; } } @@ -2338,30 +2338,30 @@ Locator* Cell_OccurrencesUnder::Locator::getClone() const return new Locator(*this); } -bool Cell_OccurrencesUnder::Locator::IsValid() const +bool Cell_OccurrencesUnder::Locator::isValid() const // ************************************************ { return (_state != 0); } -void Cell_OccurrencesUnder::Locator::Progress() +void Cell_OccurrencesUnder::Locator::progress() // ******************************************* { if (_state) { switch (_state) { case 1 : - _componentLocator.Progress(); - if (!_componentLocator.IsValid()) { + _componentLocator.progress(); + if (!_componentLocator.isValid()) { _rubberLocator = _cell->getRubbersUnder(_area).getLocator(); - if (_rubberLocator.IsValid()) + if (_rubberLocator.isValid()) _state = 2; else { _markerLocator = _cell->getMarkersUnder(_area).getLocator(); - if (_markerLocator.IsValid()) + if (_markerLocator.isValid()) _state = 3; else { _instanceLocator = _cell->getInstancesUnder(_area).getLocator(); - if (_instanceLocator.IsValid()) + if (_instanceLocator.isValid()) _state = 4; else _state = 0; @@ -2370,14 +2370,14 @@ void Cell_OccurrencesUnder::Locator::Progress() } break; case 2 : - _rubberLocator.Progress(); - if (!_rubberLocator.IsValid()) { + _rubberLocator.progress(); + if (!_rubberLocator.isValid()) { _markerLocator = _cell->getMarkersUnder(_area).getLocator(); - if (_markerLocator.IsValid()) + if (_markerLocator.isValid()) _state = 3; else { _instanceLocator = _cell->getInstancesUnder(_area).getLocator(); - if (_instanceLocator.IsValid()) + if (_instanceLocator.isValid()) _state = 4; else _state = 0; @@ -2385,10 +2385,10 @@ void Cell_OccurrencesUnder::Locator::Progress() } break; case 3 : - _markerLocator.Progress(); - if (!_markerLocator.IsValid()) { + _markerLocator.progress(); + if (!_markerLocator.isValid()) { _instanceLocator = _cell->getInstancesUnder(_area).getLocator(); - if (_instanceLocator.IsValid()) + if (_instanceLocator.isValid()) _state = 4; else _state = 0; @@ -2396,14 +2396,14 @@ void Cell_OccurrencesUnder::Locator::Progress() break; case 4 : if (!_searchDepth) { - _instanceLocator.Progress(); - if (!_instanceLocator.IsValid()) _state = 0; + _instanceLocator.progress(); + if (!_instanceLocator.isValid()) _state = 0; } else { Instance* instance = _instanceLocator.getElement(); if (instance->IsTerminal()) { - _instanceLocator.Progress(); - if (!_instanceLocator.IsValid()) _state = 0; + _instanceLocator.progress(); + if (!_instanceLocator.isValid()) _state = 0; } else { Box masterArea = _area; @@ -2411,20 +2411,20 @@ void Cell_OccurrencesUnder::Locator::Progress() Cell* masterCell = instance->getMasterCell(); _occurrenceLocator = masterCell->getOccurrencesUnder(masterArea, _searchDepth - 1).getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 5; else { - _instanceLocator.Progress(); - if (!_instanceLocator.IsValid()) _state = 0; + _instanceLocator.progress(); + if (!_instanceLocator.isValid()) _state = 0; } } } break; case 5 : - _occurrenceLocator.Progress(); - if (!_occurrenceLocator.IsValid()) { - _instanceLocator.Progress(); - if (_instanceLocator.IsValid()) + _occurrenceLocator.progress(); + if (!_occurrenceLocator.isValid()) { + _instanceLocator.progress(); + if (_instanceLocator.isValid()) _state = 4; else _state = 0; @@ -2510,17 +2510,17 @@ Cell_LeafInstanceOccurrences::Locator::Locator(const Cell* cell) { if (_cell) { _leafInstanceLocator = _cell->getLeafInstances().getLocator(); - if (_leafInstanceLocator.IsValid()) + if (_leafInstanceLocator.isValid()) _state = 1; else { _nonLeafInstanceLocator = _cell->getNonLeafInstances().getLocator(); - while (!_state && _nonLeafInstanceLocator.IsValid()) { + while (!_state && _nonLeafInstanceLocator.isValid()) { Cell* masterCell = _nonLeafInstanceLocator.getElement()->getMasterCell(); _occurrenceLocator = masterCell->getLeafInstanceOccurrences().getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _nonLeafInstanceLocator.Progress(); + _nonLeafInstanceLocator.progress(); } } } @@ -2571,46 +2571,46 @@ Locator* Cell_LeafInstanceOccurrences::Locator::getClone() const return new Locator(*this); } -bool Cell_LeafInstanceOccurrences::Locator::IsValid() const +bool Cell_LeafInstanceOccurrences::Locator::isValid() const // *********************************************************** { return (_state != 0); } -void Cell_LeafInstanceOccurrences::Locator::Progress() +void Cell_LeafInstanceOccurrences::Locator::progress() // ****************************************************** { if (_state) { switch (_state) { case 1 : - _leafInstanceLocator.Progress(); - if (!_leafInstanceLocator.IsValid()) { + _leafInstanceLocator.progress(); + if (!_leafInstanceLocator.isValid()) { _state = 0; _nonLeafInstanceLocator = _cell->getNonLeafInstances().getLocator(); - while (!_state && _nonLeafInstanceLocator.IsValid()) { + while (!_state && _nonLeafInstanceLocator.isValid()) { Cell* masterCell = _nonLeafInstanceLocator.getElement()->getMasterCell(); _occurrenceLocator = masterCell->getLeafInstanceOccurrences().getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _nonLeafInstanceLocator.Progress(); + _nonLeafInstanceLocator.progress(); } } break; case 2 : - _occurrenceLocator.Progress(); - if (!_occurrenceLocator.IsValid()) { + _occurrenceLocator.progress(); + if (!_occurrenceLocator.isValid()) { _state = 0; - if (_nonLeafInstanceLocator.IsValid()) { - _nonLeafInstanceLocator.Progress(); - while (!_state && _nonLeafInstanceLocator.IsValid()) { + if (_nonLeafInstanceLocator.isValid()) { + _nonLeafInstanceLocator.progress(); + while (!_state && _nonLeafInstanceLocator.isValid()) { Cell* masterCell = _nonLeafInstanceLocator.getElement()->getMasterCell(); _occurrenceLocator = masterCell->getLeafInstanceOccurrences().getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _nonLeafInstanceLocator.Progress(); + _nonLeafInstanceLocator.progress(); } } } @@ -2720,21 +2720,21 @@ Cell_LeafInstanceOccurrencesUnder::Locator::Locator(const Cell* cell, const Box& { if (_cell && !_area.isEmpty()) { _leafInstanceLocator = _cell->getLeafInstancesUnder(_area).getLocator(); - if (_leafInstanceLocator.IsValid()) + if (_leafInstanceLocator.isValid()) _state = 1; else { _nonLeafInstanceLocator = _cell->getNonLeafInstancesUnder(_area).getLocator(); - while (!_state && _nonLeafInstanceLocator.IsValid()) { + while (!_state && _nonLeafInstanceLocator.isValid()) { Instance* instance = _nonLeafInstanceLocator.getElement(); Cell* masterCell = instance->getMasterCell(); Box masterArea = _area; instance->getTransformation().getInvert().applyOn(masterArea); _occurrenceLocator = masterCell->getLeafInstanceOccurrencesUnder(masterArea).getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _nonLeafInstanceLocator.Progress(); + _nonLeafInstanceLocator.progress(); } } } @@ -2787,53 +2787,53 @@ Locator* Cell_LeafInstanceOccurrencesUnder::Locator::getClone() cons return new Locator(*this); } -bool Cell_LeafInstanceOccurrencesUnder::Locator::IsValid() const +bool Cell_LeafInstanceOccurrencesUnder::Locator::isValid() const // **************************************************************** { return (_state != 0); } -void Cell_LeafInstanceOccurrencesUnder::Locator::Progress() +void Cell_LeafInstanceOccurrencesUnder::Locator::progress() // *********************************************************** { if (_state) { switch (_state) { case 1 : - _leafInstanceLocator.Progress(); - if (!_leafInstanceLocator.IsValid()) { + _leafInstanceLocator.progress(); + if (!_leafInstanceLocator.isValid()) { _state = 0; _nonLeafInstanceLocator = _cell->getNonLeafInstancesUnder(_area).getLocator(); - while (!_state && _nonLeafInstanceLocator.IsValid()) { + while (!_state && _nonLeafInstanceLocator.isValid()) { Instance* instance = _nonLeafInstanceLocator.getElement(); Cell* masterCell = instance->getMasterCell(); Box masterArea = _area; instance->getTransformation().getInvert().applyOn(masterArea); _occurrenceLocator = masterCell->getLeafInstanceOccurrencesUnder(masterArea).getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _nonLeafInstanceLocator.Progress(); + _nonLeafInstanceLocator.progress(); } } break; case 2 : - _occurrenceLocator.Progress(); - if (!_occurrenceLocator.IsValid()) { + _occurrenceLocator.progress(); + if (!_occurrenceLocator.isValid()) { _state = 0; - if (_nonLeafInstanceLocator.IsValid()) { - _nonLeafInstanceLocator.Progress(); - while (!_state && _nonLeafInstanceLocator.IsValid()) { + if (_nonLeafInstanceLocator.isValid()) { + _nonLeafInstanceLocator.progress(); + while (!_state && _nonLeafInstanceLocator.isValid()) { Instance* instance = _nonLeafInstanceLocator.getElement(); Cell* masterCell = instance->getMasterCell(); Box masterArea = _area; instance->getTransformation().getInvert().applyOn(masterArea); _occurrenceLocator = masterCell->getLeafInstanceOccurrencesUnder(masterArea).getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _nonLeafInstanceLocator.Progress(); + _nonLeafInstanceLocator.progress(); } } } @@ -2919,17 +2919,17 @@ Cell_TerminalInstanceOccurrences::Locator::Locator(const Cell* cell) { if (_cell) { _terminalInstanceLocator = _cell->getTerminalInstances().getLocator(); - if (_terminalInstanceLocator.IsValid()) + if (_terminalInstanceLocator.isValid()) _state = 1; else { _nonTerminalInstanceLocator = _cell->getNonTerminalInstances().getLocator(); - while (!_state && _nonTerminalInstanceLocator.IsValid()) { + while (!_state && _nonTerminalInstanceLocator.isValid()) { Cell* masterCell = _nonTerminalInstanceLocator.getElement()->getMasterCell(); _occurrenceLocator = masterCell->getTerminalInstanceOccurrences().getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _nonTerminalInstanceLocator.Progress(); + _nonTerminalInstanceLocator.progress(); } } } @@ -2980,46 +2980,46 @@ Locator* Cell_TerminalInstanceOccurrences::Locator::getClone() const return new Locator(*this); } -bool Cell_TerminalInstanceOccurrences::Locator::IsValid() const +bool Cell_TerminalInstanceOccurrences::Locator::isValid() const // *********************************************************** { return (_state != 0); } -void Cell_TerminalInstanceOccurrences::Locator::Progress() +void Cell_TerminalInstanceOccurrences::Locator::progress() // ****************************************************** { if (_state) { switch (_state) { case 1 : - _terminalInstanceLocator.Progress(); - if (!_terminalInstanceLocator.IsValid()) { + _terminalInstanceLocator.progress(); + if (!_terminalInstanceLocator.isValid()) { _state = 0; _nonTerminalInstanceLocator = _cell->getNonTerminalInstances().getLocator(); - while (!_state && _nonTerminalInstanceLocator.IsValid()) { + while (!_state && _nonTerminalInstanceLocator.isValid()) { Cell* masterCell = _nonTerminalInstanceLocator.getElement()->getMasterCell(); _occurrenceLocator = masterCell->getTerminalInstanceOccurrences().getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _nonTerminalInstanceLocator.Progress(); + _nonTerminalInstanceLocator.progress(); } } break; case 2 : - _occurrenceLocator.Progress(); - if (!_occurrenceLocator.IsValid()) { + _occurrenceLocator.progress(); + if (!_occurrenceLocator.isValid()) { _state = 0; - if (_nonTerminalInstanceLocator.IsValid()) { - _nonTerminalInstanceLocator.Progress(); - while (!_state && _nonTerminalInstanceLocator.IsValid()) { + if (_nonTerminalInstanceLocator.isValid()) { + _nonTerminalInstanceLocator.progress(); + while (!_state && _nonTerminalInstanceLocator.isValid()) { Cell* masterCell = _nonTerminalInstanceLocator.getElement()->getMasterCell(); _occurrenceLocator = masterCell->getTerminalInstanceOccurrences().getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _nonTerminalInstanceLocator.Progress(); + _nonTerminalInstanceLocator.progress(); } } } @@ -3129,21 +3129,21 @@ Cell_TerminalInstanceOccurrencesUnder::Locator::Locator(const Cell* cell, const { if (_cell && !_area.isEmpty()) { _terminalInstanceLocator = _cell->getTerminalInstancesUnder(_area).getLocator(); - if (_terminalInstanceLocator.IsValid()) + if (_terminalInstanceLocator.isValid()) _state = 1; else { _nonTerminalInstanceLocator = _cell->getNonTerminalInstancesUnder(_area).getLocator(); - while (!_state && _nonTerminalInstanceLocator.IsValid()) { + while (!_state && _nonTerminalInstanceLocator.isValid()) { Instance* instance = _nonTerminalInstanceLocator.getElement(); Cell* masterCell = instance->getMasterCell(); Box masterArea = _area; instance->getTransformation().getInvert().applyOn(masterArea); _occurrenceLocator = masterCell->getTerminalInstanceOccurrencesUnder(masterArea).getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _nonTerminalInstanceLocator.Progress(); + _nonTerminalInstanceLocator.progress(); } } } @@ -3196,53 +3196,53 @@ Locator* Cell_TerminalInstanceOccurrencesUnder::Locator::getClone() return new Locator(*this); } -bool Cell_TerminalInstanceOccurrencesUnder::Locator::IsValid() const +bool Cell_TerminalInstanceOccurrencesUnder::Locator::isValid() const // **************************************************************** { return (_state != 0); } -void Cell_TerminalInstanceOccurrencesUnder::Locator::Progress() +void Cell_TerminalInstanceOccurrencesUnder::Locator::progress() // *********************************************************** { if (_state) { switch (_state) { case 1 : - _terminalInstanceLocator.Progress(); - if (!_terminalInstanceLocator.IsValid()) { + _terminalInstanceLocator.progress(); + if (!_terminalInstanceLocator.isValid()) { _state = 0; _nonTerminalInstanceLocator = _cell->getNonTerminalInstancesUnder(_area).getLocator(); - while (!_state && _nonTerminalInstanceLocator.IsValid()) { + while (!_state && _nonTerminalInstanceLocator.isValid()) { Instance* instance = _nonTerminalInstanceLocator.getElement(); Cell* masterCell = instance->getMasterCell(); Box masterArea = _area; instance->getTransformation().getInvert().applyOn(masterArea); _occurrenceLocator = masterCell->getTerminalInstanceOccurrencesUnder(masterArea).getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _nonTerminalInstanceLocator.Progress(); + _nonTerminalInstanceLocator.progress(); } } break; case 2 : - _occurrenceLocator.Progress(); - if (!_occurrenceLocator.IsValid()) { + _occurrenceLocator.progress(); + if (!_occurrenceLocator.isValid()) { _state = 0; - if (_nonTerminalInstanceLocator.IsValid()) { - _nonTerminalInstanceLocator.Progress(); - while (!_state && _nonTerminalInstanceLocator.IsValid()) { + if (_nonTerminalInstanceLocator.isValid()) { + _nonTerminalInstanceLocator.progress(); + while (!_state && _nonTerminalInstanceLocator.isValid()) { Instance* instance = _nonTerminalInstanceLocator.getElement(); Cell* masterCell = instance->getMasterCell(); Box masterArea = _area; instance->getTransformation().getInvert().applyOn(masterArea); _occurrenceLocator = masterCell->getTerminalInstanceOccurrencesUnder(masterArea).getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _nonTerminalInstanceLocator.Progress(); + _nonTerminalInstanceLocator.progress(); } } } @@ -3355,17 +3355,17 @@ Cell_ComponentOccurrences::Locator::Locator(const Cell* cell, const Layer::Mask& { if (_cell && (_mask != 0)) { _componentLocator = _cell->getComponents(_mask).getLocator(); - if (_componentLocator.IsValid()) + if (_componentLocator.isValid()) _state = 1; else { _instanceLocator = _cell->getInstances().getLocator(); - while (!_state && _instanceLocator.IsValid()) { + while (!_state && _instanceLocator.isValid()) { Cell* masterCell = _instanceLocator.getElement()->getMasterCell(); _occurrenceLocator = masterCell->getComponentOccurrences(_mask).getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _instanceLocator.Progress(); + _instanceLocator.progress(); } } } @@ -3418,45 +3418,45 @@ Locator* Cell_ComponentOccurrences::Locator::getClone() const return new Locator(*this); } -bool Cell_ComponentOccurrences::Locator::IsValid() const +bool Cell_ComponentOccurrences::Locator::isValid() const // **************************************************** { return (_state != 0); } -void Cell_ComponentOccurrences::Locator::Progress() +void Cell_ComponentOccurrences::Locator::progress() // *********************************************** { if (_state) { switch (_state) { case 1 : - _componentLocator.Progress(); - if (!_componentLocator.IsValid()) { + _componentLocator.progress(); + if (!_componentLocator.isValid()) { _state = 0; _instanceLocator = _cell->getInstances().getLocator(); - while (!_state && _instanceLocator.IsValid()) { + while (!_state && _instanceLocator.isValid()) { Cell* masterCell = _instanceLocator.getElement()->getMasterCell(); _occurrenceLocator = masterCell->getComponentOccurrences(_mask).getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _instanceLocator.Progress(); + _instanceLocator.progress(); } } break; case 2 : - _occurrenceLocator.Progress(); - if (!_occurrenceLocator.IsValid()) { + _occurrenceLocator.progress(); + if (!_occurrenceLocator.isValid()) { _state = 0; - if (_instanceLocator.IsValid()) { - _instanceLocator.Progress(); - while (!_state && _instanceLocator.IsValid()) { + if (_instanceLocator.isValid()) { + _instanceLocator.progress(); + while (!_state && _instanceLocator.isValid()) { Cell* masterCell = _instanceLocator.getElement()->getMasterCell(); _occurrenceLocator = masterCell->getComponentOccurrences(_mask).getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _instanceLocator.Progress(); + _instanceLocator.progress(); } } } @@ -3576,21 +3576,21 @@ Cell_ComponentOccurrencesUnder::Locator::Locator(const Cell* cell, const Box& ar { if (_cell && !_area.isEmpty() && (_mask != 0)) { _componentLocator = _cell->getComponentsUnder(_area, _mask).getLocator(); - if (_componentLocator.IsValid()) + if (_componentLocator.isValid()) _state = 1; else { _instanceLocator = _cell->getInstancesUnder(_area).getLocator(); - while (!_state && _instanceLocator.IsValid()) { + while (!_state && _instanceLocator.isValid()) { Instance* instance = _instanceLocator.getElement(); Cell* masterCell = instance->getMasterCell(); Box masterArea = _area; instance->getTransformation().getInvert().applyOn(masterArea); _occurrenceLocator = masterCell->getComponentOccurrencesUnder(masterArea, _mask).getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _instanceLocator.Progress(); + _instanceLocator.progress(); } } } @@ -3645,53 +3645,53 @@ Locator* Cell_ComponentOccurrencesUnder::Locator::getClone() const return new Locator(*this); } -bool Cell_ComponentOccurrencesUnder::Locator::IsValid() const +bool Cell_ComponentOccurrencesUnder::Locator::isValid() const // ********************************************************* { return (_state != 0); } -void Cell_ComponentOccurrencesUnder::Locator::Progress() +void Cell_ComponentOccurrencesUnder::Locator::progress() // **************************************************** { if (_state) { switch (_state) { case 1 : - _componentLocator.Progress(); - if (!_componentLocator.IsValid()) { + _componentLocator.progress(); + if (!_componentLocator.isValid()) { _state = 0; _instanceLocator = _cell->getInstancesUnder(_area).getLocator(); - while (!_state && _instanceLocator.IsValid()) { + while (!_state && _instanceLocator.isValid()) { Instance* instance = _instanceLocator.getElement(); Cell* masterCell = instance->getMasterCell(); Box masterArea = _area; instance->getTransformation().getInvert().applyOn(masterArea); _occurrenceLocator = masterCell->getComponentOccurrencesUnder(masterArea, _mask).getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _instanceLocator.Progress(); + _instanceLocator.progress(); } } break; case 2 : - _occurrenceLocator.Progress(); - if (!_occurrenceLocator.IsValid()) { + _occurrenceLocator.progress(); + if (!_occurrenceLocator.isValid()) { _state = 0; - if (_instanceLocator.IsValid()) { - _instanceLocator.Progress(); - while (!_state && _instanceLocator.IsValid()) { + if (_instanceLocator.isValid()) { + _instanceLocator.progress(); + while (!_state && _instanceLocator.isValid()) { Instance* instance = _instanceLocator.getElement(); Cell* masterCell = instance->getMasterCell(); Box masterArea = _area; instance->getTransformation().getInvert().applyOn(masterArea); _occurrenceLocator = masterCell->getComponentOccurrencesUnder(masterArea, _mask).getLocator(); - if (_occurrenceLocator.IsValid()) + if (_occurrenceLocator.isValid()) _state = 2; else - _instanceLocator.Progress(); + _instanceLocator.progress(); } } } @@ -3801,15 +3801,15 @@ Cell_HyperNetRootNetOccurrences::Locator::Locator(const Cell* cell, Path path) _instanceLocator=cell->getInstances().getLocator(); - while (_netLocator.IsValid() && !IsHyperNetRootNetOccurrence(Occurrence(_netLocator.getElement(),_path))) - _netLocator.Progress(); + while (_netLocator.isValid() && !IsHyperNetRootNetOccurrence(Occurrence(_netLocator.getElement(),_path))) + _netLocator.progress(); - if (!_netLocator.IsValid()) - while (!_hyperNetRootNetOccurrenceLocator.IsValid() && _instanceLocator.IsValid()) + if (!_netLocator.isValid()) + while (!_hyperNetRootNetOccurrenceLocator.isValid() && _instanceLocator.isValid()) { Instance* instance = _instanceLocator.getElement(); _hyperNetRootNetOccurrenceLocator=Locator(instance->getMasterCell(),Path(_path,instance)); - _instanceLocator.Progress(); + _instanceLocator.progress(); } } @@ -3836,9 +3836,9 @@ Cell_HyperNetRootNetOccurrences::Locator& Cell_HyperNetRootNetOccurrences::Locat Occurrence Cell_HyperNetRootNetOccurrences::Locator::getElement() const // ****************************************************** { - if (_netLocator.IsValid()) + if (_netLocator.isValid()) return Occurrence(_netLocator.getElement(),_path); - else if (_hyperNetRootNetOccurrenceLocator.IsValid()) + else if (_hyperNetRootNetOccurrenceLocator.isValid()) return _hyperNetRootNetOccurrenceLocator.getElement(); else return Occurrence(); @@ -3851,31 +3851,31 @@ Locator* Cell_HyperNetRootNetOccurrences::Locator::getClone() const return new Locator(*this); } -bool Cell_HyperNetRootNetOccurrences::Locator::IsValid() const +bool Cell_HyperNetRootNetOccurrences::Locator::isValid() const // ********************************************** { - return (_netLocator.IsValid() || (_hyperNetRootNetOccurrenceLocator.IsValid())); + return (_netLocator.isValid() || (_hyperNetRootNetOccurrenceLocator.isValid())); } -void Cell_HyperNetRootNetOccurrences::Locator::Progress() +void Cell_HyperNetRootNetOccurrences::Locator::progress() // ***************************************** { - if (_netLocator.IsValid()) + if (_netLocator.isValid()) { do { - _netLocator.Progress(); + _netLocator.progress(); } - while (_netLocator.IsValid() && !IsHyperNetRootNetOccurrence(Occurrence(_netLocator.getElement(),_path))); + while (_netLocator.isValid() && !IsHyperNetRootNetOccurrence(Occurrence(_netLocator.getElement(),_path))); } - else if (_hyperNetRootNetOccurrenceLocator.IsValid()) - _hyperNetRootNetOccurrenceLocator.Progress(); + else if (_hyperNetRootNetOccurrenceLocator.isValid()) + _hyperNetRootNetOccurrenceLocator.progress(); - if (!_netLocator.IsValid()) - while (!_hyperNetRootNetOccurrenceLocator.IsValid() && _instanceLocator.IsValid()) + if (!_netLocator.isValid()) + while (!_hyperNetRootNetOccurrenceLocator.isValid() && _instanceLocator.isValid()) { Instance* instance = _instanceLocator.getElement(); _hyperNetRootNetOccurrenceLocator=Locator(instance->getMasterCell(),Path(_path,instance)); - _instanceLocator.Progress(); + _instanceLocator.progress(); } } @@ -4006,19 +4006,19 @@ string Cell_HyperNetRootNetOccurrences::Locator::_getString() const // return new Locator(*this); //} // -//bool Cell_ImpactedMainViews::Locator::IsValid() const +//bool Cell_ImpactedMainViews::Locator::isValid() const //// ************************************************** //{ // return (_mainView != NULL); //} // -//void Cell_ImpactedMainViews::Locator::Progress() +//void Cell_ImpactedMainViews::Locator::progress() //// ********************************************* //{ // if (_mainView) { // _mainView = NULL; // do { -// _mainViewLocator.Progress(); +// _mainViewLocator.progress(); // _mainView = _mainViewLocator.getElement(); // if (!_mainView && !_cellStack.empty()) { // Cell* cell = _cellStack.top(); @@ -4123,7 +4123,7 @@ Cell_SubCells::Locator::Locator(InstanceLocator instanceLocator) _cellSet(), _instanceLocator(instanceLocator) { - if ( IsValid() ) + if ( isValid() ) _cellSet.insert ( _instanceLocator.getElement()->getMasterCell() ); } @@ -4155,18 +4155,18 @@ Locator* Cell_SubCells::Locator::getClone() const return new Locator(*this); } -bool Cell_SubCells::Locator::IsValid() const +bool Cell_SubCells::Locator::isValid() const // ***************************************** { - return _instanceLocator.IsValid(); + return _instanceLocator.isValid(); } -void Cell_SubCells::Locator::Progress() +void Cell_SubCells::Locator::progress() // ************************************ { - while ( IsValid() && ( _cellSet.find ( _instanceLocator.getElement()->getMasterCell() ) != _cellSet.end() ) ) - _instanceLocator.Progress(); - if ( IsValid() ) + while ( isValid() && ( _cellSet.find ( _instanceLocator.getElement()->getMasterCell() ) != _cellSet.end() ) ) + _instanceLocator.progress(); + if ( isValid() ) _cellSet.insert ( _instanceLocator.getElement()->getMasterCell() ); } @@ -4221,14 +4221,14 @@ Cell_RecursiveSlavePathes::Locator::Locator ( const Cell* cell ) // ------------------------------------------------------------------- -// Modifier : "Cell_RecursiveSlavePathes::Locator::Progress ()". +// Modifier : "Cell_RecursiveSlavePathes::Locator::progress ()". -void Cell_RecursiveSlavePathes::Locator::Progress () +void Cell_RecursiveSlavePathes::Locator::progress () { - if ( !IsValid() ) return; + if ( !isValid() ) return; - _instancesStack.back().Progress(); - if ( _instancesStack.back().IsValid() ) { + _instancesStack.back().progress(); + if ( _instancesStack.back().isValid() ) { // cerr << "Head N: " << _instancesStack.back().getElement()->getName() << endl; // cerr << "TailPath N: " << _instancePath.getTailPath().getName() << endl; _instancePath = Path ( _instancesStack.back().getElement(), _instancePath.getTailPath() ); @@ -4269,7 +4269,7 @@ string Cell_RecursiveSlavePathes::Locator::_getString () const { Name masterCellName = "Finished"; - if ( IsValid() ) + if ( isValid() ) masterCellName = _instancesStack.front().getElement()->getMasterCell()->getName(); string s = "<" + _TName("Cell_RecursiveSlavePathes::Locator") diff --git a/hurricane/src/hurricane/Cells.h b/hurricane/src/hurricane/Cells.h index a761a051..ec560b92 100644 --- a/hurricane/src/hurricane/Cells.h +++ b/hurricane/src/hurricane/Cells.h @@ -47,9 +47,9 @@ typedef GenericFilter CellFilter; /*********************************/\ {\ CellLocator _locator = cells.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Cell* cell = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Collection.h b/hurricane/src/hurricane/Collection.h index 2e07d9ff..af117b4f 100644 --- a/hurricane/src/hurricane/Collection.h +++ b/hurricane/src/hurricane/Collection.h @@ -68,9 +68,9 @@ template class Collection : public NestedSlotAdapter { unsigned size = 0; // we use a GenericLocator to delete the locator allocated by getLocator() GenericLocator locator = getLocator(); - while (locator.IsValid()) { + while (locator.isValid()) { size++; - locator.Progress(); + locator.progress(); } return size; } @@ -108,7 +108,7 @@ template class Collection : public NestedSlotAdapter { // ************************* { // we use a GenericLocator to delete the locator allocated by getLocator() - return !GenericLocator(getLocator()).IsValid(); + return !GenericLocator(getLocator()).isValid(); } // Utilitarians @@ -118,9 +118,9 @@ template class Collection : public NestedSlotAdapter { // ************************************** { GenericLocator locator = getLocator(); - while (locator.IsValid()) { + while (locator.isValid()) { list.push_back(locator.getElement()); - locator.Progress(); + locator.progress(); } } @@ -128,9 +128,9 @@ template class Collection : public NestedSlotAdapter { // ************************************ { GenericLocator locator = getLocator(); - while (locator.IsValid()) { + while (locator.isValid()) { set.insert(locator.getElement()); - locator.Progress(); + locator.progress(); } } @@ -138,9 +138,9 @@ template class Collection : public NestedSlotAdapter { // ********************************************************************* { GenericLocator locator = getLocator(); - while (locator.IsValid()) { + while (locator.isValid()) { set.insert(locator.getElement()); - locator.Progress(); + locator.progress(); } } @@ -148,9 +148,9 @@ template class Collection : public NestedSlotAdapter { // ****************************************** { GenericLocator locator = getLocator(); - while (locator.IsValid()) { + while (locator.isValid()) { vector.push_back(locator.getElement()); - locator.Progress(); + locator.progress(); } } @@ -173,11 +173,11 @@ template class Collection : public NestedSlotAdapter { record = new Record(getString(this)); unsigned n = 1; GenericLocator locator = getLocator(); - while (locator.IsValid()) { + while (locator.isValid()) { string slotName = getString(n++); Type slotRecord = locator.getElement(); record->Add(getSlot(slotName, slotRecord)); - locator.Progress(); + locator.progress(); } } return record; @@ -343,8 +343,8 @@ template class ElementCollection : public Collection { // ********* public: virtual ElType getElement () const { return const_cast(_element); }; public: virtual Locator* getClone () const { return new Locator(*this); }; - public: virtual bool IsValid () const { return !_done; }; - public: virtual void Progress () { _done = true; }; + public: virtual bool isValid () const { return !_done; }; + public: virtual void progress () { _done = true; }; // Hurricane Management // ******************** @@ -461,8 +461,8 @@ template class SubTypeCollection : public Collection< : Inherit(), _locator(collection.getLocator()) { - while (_locator.IsValid() && !is_a(_locator.getElement())) - _locator.Progress(); + while (_locator.isValid() && !is_a(_locator.getElement())) + _locator.progress(); } public: Locator(const GenericLocator& genericLocator) @@ -470,8 +470,8 @@ template class SubTypeCollection : public Collection< : Inherit(), _locator(genericLocator.getClone()) { - while (_locator.IsValid() && !is_a(_locator.getElement())) - _locator.Progress(); + while (_locator.isValid() && !is_a(_locator.getElement())) + _locator.progress(); } // Accessors @@ -480,7 +480,7 @@ template class SubTypeCollection : public Collection< public: virtual SubType getElement() const // *************************************** { - return (_locator.IsValid()) ? (SubType)_locator.getElement() : SubType(); + return (_locator.isValid()) ? (SubType)_locator.getElement() : SubType(); } public: virtual Hurricane::Locator* getClone() const @@ -500,22 +500,22 @@ template class SubTypeCollection : public Collection< // Predicates // ********** - public: virtual bool IsValid() const + public: virtual bool isValid() const // ********************************* { - return _locator.IsValid(); + return _locator.isValid(); } // Updators // ******** - public: virtual void Progress() + public: virtual void progress() // **************************** { - if (_locator.IsValid()) { + if (_locator.isValid()) { do { - _locator.Progress(); - } while (_locator.IsValid() && !is_a(_locator.getElement())); + _locator.progress(); + } while (_locator.isValid() && !is_a(_locator.getElement())); } } @@ -630,8 +630,8 @@ template class SubSetCollection : public Collection { _locator(collection.getLocator()), _filter(filter) { - while (_locator.IsValid() && !_filter.Accept(_locator.getElement())) - _locator.Progress(); + while (_locator.isValid() && !_filter.accept(_locator.getElement())) + _locator.progress(); } public: Locator(const Collection& collection, const Filter& filter) @@ -640,8 +640,8 @@ template class SubSetCollection : public Collection { _locator(collection.getLocator()), _filter(filter) { - while (_locator.IsValid() && !_filter.Accept(_locator.getElement())) - _locator.Progress(); + while (_locator.isValid() && !_filter.accept(_locator.getElement())) + _locator.progress(); } public: Locator(const GenericCollection& genericCollection, const Filter& filter) @@ -650,8 +650,8 @@ template class SubSetCollection : public Collection { _locator(genericCollection.getLocator()), _filter(filter) { - while (_locator.IsValid() && !_filter.Accept(_locator.getElement())) - _locator.Progress(); + while (_locator.isValid() && !_filter.accept(_locator.getElement())) + _locator.progress(); } public: Locator(const GenericLocator& genericLocator, const Filter& filter) @@ -660,8 +660,8 @@ template class SubSetCollection : public Collection { _locator(genericLocator), _filter(filter) { - while (_locator.IsValid() && !_filter.Accept(_locator.getElement())) - _locator.Progress(); + while (_locator.isValid() && !_filter.accept(_locator.getElement())) + _locator.progress(); } // Accessors @@ -670,7 +670,7 @@ template class SubSetCollection : public Collection { public: virtual Type getElement() const // ************************************ { - return (_locator.IsValid()) ? _locator.getElement() : Type(); + return (_locator.isValid()) ? _locator.getElement() : Type(); } public: virtual Hurricane::Locator* getClone() const @@ -688,22 +688,22 @@ template class SubSetCollection : public Collection { // Predicates // ********** - public: virtual bool IsValid() const + public: virtual bool isValid() const // ********************************* { - return _locator.IsValid(); + return _locator.isValid(); } // Updators // ******** - public: virtual void Progress() + public: virtual void progress() // **************************** { - if (_locator.IsValid()) { + if (_locator.isValid()) { do { - _locator.Progress(); - } while (_locator.IsValid() && !_filter.Accept(_locator.getElement())); + _locator.progress(); + } while (_locator.isValid() && !_filter.accept(_locator.getElement())); } } @@ -800,17 +800,17 @@ template class SubSetCollection : public Collection { /*************************************************/\ {\ GenericLocator _locator = collection.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Type element = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); #define for_each_element(Type, element, collection)\ /*************************************************/\ {\ ElementCollection::Locator* _locator = collection.getLocator();\ - while (_locator->IsValid()) {\ + while (_locator->isValid()) {\ Type element = _locator->getElement();\ - _locator->Progress(); + _locator->progress(); template diff --git a/hurricane/src/hurricane/Commons.h b/hurricane/src/hurricane/Commons.h index 5930ea53..6e20ffe2 100644 --- a/hurricane/src/hurricane/Commons.h +++ b/hurricane/src/hurricane/Commons.h @@ -26,21 +26,21 @@ -# ifndef __HURRICANE_COMMONS__ -# define __HURRICANE_COMMONS__ +#ifndef __HURRICANE_COMMONS__ +#define __HURRICANE_COMMONS__ -# include -# include +#include +#include -# include -# include -# include -# include -# include -# include -# include -# include +#include +#include +#include +#include +#include +#include +#include +#include @@ -50,13 +50,13 @@ // x-----------------------------------------------------------------x -# define Hurricane H -# define BEGIN_NAMESPACE_HURRICANE namespace Hurricane { -# define END_NAMESPACE_HURRICANE } -# define USING_NAMESPACE_HURRICANE using namespace std; using namespace Hurricane; +#define Hurricane H +#define BEGIN_NAMESPACE_HURRICANE namespace Hurricane { +#define END_NAMESPACE_HURRICANE } +#define USING_NAMESPACE_HURRICANE using namespace std; using namespace Hurricane; -# define is_a (bool)dynamic_cast +#define is_a (bool)dynamic_cast using namespace std; @@ -91,8 +91,8 @@ namespace Hurricane { void ltracein ( unsigned int level, unsigned int count=1 ); void ltraceout ( unsigned int level, unsigned int count=1 ); -# define trace if (in_trace() ) cerr << tab -# define ltrace(level) if (inltrace(level)) cerr << tab +#define trace if (in_trace() ) cerr << tab +#define ltrace(level) if (inltrace(level)) cerr << tab @@ -136,7 +136,7 @@ using namespace std; // Note: we are outside the Hurricane namespace. -# include "SlotAdapter.h" +#include "SlotAdapter.h" @@ -166,9 +166,9 @@ bool Scan ( const string& s, unsigned short& redValue // Note: Record & Tabulation are not templates, so they can be defined // early. -# include "Tabulation.h" +#include "Tabulation.h" -# endif +#endif diff --git a/hurricane/src/hurricane/Component.cpp b/hurricane/src/hurricane/Component.cpp index efaaef3a..9959c606 100644 --- a/hurricane/src/hurricane/Component.cpp +++ b/hurricane/src/hurricane/Component.cpp @@ -50,7 +50,7 @@ class Component_IsUnderFilter : public Filter { return new Component_IsUnderFilter(*this); }; - public: virtual bool Accept(Component* component) const + public: virtual bool accept(Component* component) const // **************************************************** { return _area.intersect(component->getBoundingBox()); @@ -94,9 +94,9 @@ class Component_Hooks : public Collection { public: virtual Hook* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -162,9 +162,9 @@ class Component_ConnexComponents : public Collection { public: virtual Component* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -230,9 +230,9 @@ class Component_SlaveComponents : public Collection { public: virtual Component* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -626,13 +626,13 @@ Locator* Component_Hooks::Locator::getClone() const return new Locator(*this); } -bool Component_Hooks::Locator::IsValid() const +bool Component_Hooks::Locator::isValid() const // ******************************************* { return (_hook != NULL); } -void Component_Hooks::Locator::Progress() +void Component_Hooks::Locator::progress() // ************************************** { _hook = NULL; @@ -745,13 +745,13 @@ Locator* Component_ConnexComponents::Locator::getClone() const return new Locator(*this); } -bool Component_ConnexComponents::Locator::IsValid() const +bool Component_ConnexComponents::Locator::isValid() const // ****************************************************** { return !_componentStack.empty(); } -void Component_ConnexComponents::Locator::Progress() +void Component_ConnexComponents::Locator::progress() // ************************************************* { if (!_componentStack.empty()) { @@ -895,13 +895,13 @@ Locator* Component_SlaveComponents::Locator::getClone() const return new Locator(*this); } -bool Component_SlaveComponents::Locator::IsValid() const +bool Component_SlaveComponents::Locator::isValid() const // ***************************************************** { return !_componentStack.empty(); } -void Component_SlaveComponents::Locator::Progress() +void Component_SlaveComponents::Locator::progress() // ************************************************ { if (!_componentStack.empty()) { diff --git a/hurricane/src/hurricane/Components.h b/hurricane/src/hurricane/Components.h index 47faa7e8..40bfbfb9 100644 --- a/hurricane/src/hurricane/Components.h +++ b/hurricane/src/hurricane/Components.h @@ -47,9 +47,9 @@ typedef GenericFilter ComponentFilter; /************************************************/\ {\ ComponentLocator _locator = components.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Component* component = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/CompositeLayers.h b/hurricane/src/hurricane/CompositeLayers.h index ca3eacde..a6510845 100644 --- a/hurricane/src/hurricane/CompositeLayers.h +++ b/hurricane/src/hurricane/CompositeLayers.h @@ -47,9 +47,9 @@ typedef GenericFilter CompositeLayerFilter; /****************************************************************/\ {\ CompositeLayerLocator _locator = compositeLayers.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ CompositeLayer* compositeLayer = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Contact.cpp b/hurricane/src/hurricane/Contact.cpp index 037bd7d4..fa3ce428 100644 --- a/hurricane/src/hurricane/Contact.cpp +++ b/hurricane/src/hurricane/Contact.cpp @@ -43,9 +43,9 @@ class Contact_Hooks : public Collection { public: virtual Hook* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -489,13 +489,13 @@ Locator* Contact_Hooks::Locator::getClone() const return new Locator(*this); } -bool Contact_Hooks::Locator::IsValid() const +bool Contact_Hooks::Locator::isValid() const // ***************************************** { return (_hook != NULL); } -void Contact_Hooks::Locator::Progress() +void Contact_Hooks::Locator::progress() // ************************************ { if (_hook) { diff --git a/hurricane/src/hurricane/Contacts.h b/hurricane/src/hurricane/Contacts.h index 5c03f5f0..e7747aa7 100644 --- a/hurricane/src/hurricane/Contacts.h +++ b/hurricane/src/hurricane/Contacts.h @@ -47,9 +47,9 @@ typedef GenericFilter ContactFilter; /******************************************/\ {\ ContactLocator _locator = contacts.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Contact* contact = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/DBos.h b/hurricane/src/hurricane/DBos.h index 0e7b4d92..001ba4d7 100644 --- a/hurricane/src/hurricane/DBos.h +++ b/hurricane/src/hurricane/DBos.h @@ -47,9 +47,9 @@ typedef GenericFilter DBoFilter; /******************************/\ {\ DBoLocator _locator = dbos.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ DBo* dbo = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/DeepNet.cpp b/hurricane/src/hurricane/DeepNet.cpp index cfccb560..1b6490d9 100644 --- a/hurricane/src/hurricane/DeepNet.cpp +++ b/hurricane/src/hurricane/DeepNet.cpp @@ -127,7 +127,7 @@ Record* DeepNet::_getRecord () const DeepNet* DeepNet::create ( HyperNet& hyperNet ) { - if ( !hyperNet.IsValid() ) + if ( !hyperNet.isValid() ) throw Error ( "Can't create " + _TName("DeepNet") + ": occurence is invalid." ); Occurrence rootNetOccurrence = getHyperNetRootNetOccurrence ( hyperNet.getNetOccurrence() ); diff --git a/hurricane/src/hurricane/DisplaySlots.h b/hurricane/src/hurricane/DisplaySlots.h index de1578b4..44e8f127 100644 --- a/hurricane/src/hurricane/DisplaySlots.h +++ b/hurricane/src/hurricane/DisplaySlots.h @@ -51,9 +51,9 @@ typedef GenericFilter DisplaySlotFilter; /******************************************************/\ {\ DisplaySlotLocator _locator = displaySlots.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ DisplaySlot* displaySlot = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Entities.h b/hurricane/src/hurricane/Entities.h index ab5a1695..2dde9fda 100644 --- a/hurricane/src/hurricane/Entities.h +++ b/hurricane/src/hurricane/Entities.h @@ -47,9 +47,9 @@ typedef GenericFilter EntityFilter; /****************************************/\ {\ EntityLocator _locator = entities.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Entity* entity = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Filter.h b/hurricane/src/hurricane/Filter.h index 977f5ec0..20cf3a54 100644 --- a/hurricane/src/hurricane/Filter.h +++ b/hurricane/src/hurricane/Filter.h @@ -54,7 +54,7 @@ template class Filter : public NestedSlotAdapter { // Predicates // ********** - public: virtual bool Accept(Type type) const = 0; + public: virtual bool accept(Type type) const = 0; // Others // ****** @@ -166,10 +166,10 @@ template class GenericFilter : public Filter { // Predicates // ********** - public: virtual bool Accept(Type type) const + public: virtual bool accept(Type type) const // ***************************************** { - return (_filter) ? _filter->Accept(type) : false; + return (_filter) ? _filter->accept(type) : false; }; // Others @@ -257,10 +257,10 @@ template class NotFilter : public Filter { // Predicates // ********** - public: virtual bool Accept(Type type) const + public: virtual bool accept(Type type) const // ***************************************** { - return !_genericFilter.Accept(type); + return !_genericFilter.accept(type); }; // Others diff --git a/hurricane/src/hurricane/Gos.h b/hurricane/src/hurricane/Gos.h index 1567cbc5..9b5b7ee4 100644 --- a/hurricane/src/hurricane/Gos.h +++ b/hurricane/src/hurricane/Gos.h @@ -47,9 +47,9 @@ typedef GenericFilter GoFilter; /***************************/\ {\ GoLocator _locator = gos.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Go* go = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Hook.cpp b/hurricane/src/hurricane/Hook.cpp index 6271c049..f8357882 100644 --- a/hurricane/src/hurricane/Hook.cpp +++ b/hurricane/src/hurricane/Hook.cpp @@ -28,7 +28,7 @@ class Hook_IsMasterFilter : public Filter { public: virtual Filter* getClone() const {return new Hook_IsMasterFilter(*this);}; - public: virtual bool Accept(Hook* hook) const {return hook->IsMaster();}; + public: virtual bool accept(Hook* hook) const {return hook->IsMaster();}; public: virtual string _getString() const {return "<" + _TName("Hook::IsMasterFilter>");}; @@ -64,9 +64,9 @@ class Hook_Hooks : public Collection { public: virtual Hook* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -131,9 +131,9 @@ class Hook_SlaveHooks : public Collection { public: virtual Hook* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -462,13 +462,13 @@ Locator* Hook_Hooks::Locator::getClone() const return new Locator(*this); } -bool Hook_Hooks::Locator::IsValid() const +bool Hook_Hooks::Locator::isValid() const // ************************************** { return (_currentHook != NULL); } -void Hook_Hooks::Locator::Progress() +void Hook_Hooks::Locator::progress() // ********************************* { if (_currentHook) { @@ -584,13 +584,13 @@ Locator* Hook_SlaveHooks::Locator::getClone() const return new Locator(*this); } -bool Hook_SlaveHooks::Locator::IsValid() const +bool Hook_SlaveHooks::Locator::isValid() const // ******************************************* { return (_currentHook != NULL); } -void Hook_SlaveHooks::Locator::Progress() +void Hook_SlaveHooks::Locator::progress() // ************************************** { if (_currentHook) { diff --git a/hurricane/src/hurricane/Hooks.h b/hurricane/src/hurricane/Hooks.h index d74e0cdc..144f8bad 100644 --- a/hurricane/src/hurricane/Hooks.h +++ b/hurricane/src/hurricane/Hooks.h @@ -47,9 +47,9 @@ typedef GenericFilter HookFilter; /*********************************/\ {\ HookLocator _locator = hooks.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Hook* hook = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Horizontals.h b/hurricane/src/hurricane/Horizontals.h index dbb75803..e1ba4820 100644 --- a/hurricane/src/hurricane/Horizontals.h +++ b/hurricane/src/hurricane/Horizontals.h @@ -47,9 +47,9 @@ typedef GenericFilter HorizontalFilter; /***************************************************/\ {\ HorizontalLocator _locator = horizontals.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Horizontal* horizontal = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/HyperNet.cpp b/hurricane/src/hurricane/HyperNet.cpp index bc924d7e..746eef8e 100644 --- a/hurricane/src/hurricane/HyperNet.cpp +++ b/hurricane/src/hurricane/HyperNet.cpp @@ -50,9 +50,9 @@ class HyperNet_NetOccurrences : public Collection { public: virtual Occurrence getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -124,9 +124,9 @@ class HyperNet_NetOccurrencesUnder : public Collection { public: virtual Occurrence getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -200,9 +200,9 @@ class HyperNet_LeafPlugOccurrences : public Collection { public: virtual Occurrence getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -250,7 +250,7 @@ HyperNet::HyperNet(const Occurrence& occurrence) // ******************************************* : _netOccurrence() { - if (occurrence.IsValid()) { + if (occurrence.isValid()) { Entity* entity = occurrence.getEntity(); if (is_a(entity)) _netOccurrence = occurrence; @@ -293,7 +293,7 @@ string HyperNet::_getString() const // ******************************** { string s = "<" + _TName("HyperNet"); - if (IsValid()) s += " " + getString(_netOccurrence); + if (isValid()) s += " " + getString(_netOccurrence); s += ">"; return s; } @@ -311,7 +311,7 @@ Record* HyperNet::_getRecord() const Occurrence getHyperNetRootNetOccurrence(const Occurrence& netoccurrence) // ********************************************************************* { - if (!netoccurrence.IsValid()) + if (!netoccurrence.isValid()) throw Error("getHyperNetRootNetOccurrence : invalid occurrence"); Net* net = dynamic_cast(netoccurrence.getEntity()); @@ -449,7 +449,7 @@ HyperNet_NetOccurrences::Locator::Locator(const HyperNet* hyperNet, bool doExtra { if (_hyperNet) { Occurrence netOccurrence = _hyperNet->getNetOccurrence(); - if (netOccurrence.IsValid()) { + if (netOccurrence.isValid()) { _netOccurrenceSet.insert(netOccurrence); _netOccurrenceStack.push(netOccurrence); } @@ -490,7 +490,7 @@ Locator* HyperNet_NetOccurrences::Locator::getClone() const return new Locator(*this); } -bool HyperNet_NetOccurrences::Locator::IsValid() const +bool HyperNet_NetOccurrences::Locator::isValid() const // ************************************************** { return !_netOccurrenceStack.empty(); @@ -521,7 +521,7 @@ static bool IsConnex(const Occurrence& componentOccurrence1, const Occurrence& c return false; } -void HyperNet_NetOccurrences::Locator::Progress() +void HyperNet_NetOccurrences::Locator::progress() // ********************************************* { if (!_netOccurrenceStack.empty()) { @@ -703,7 +703,7 @@ HyperNet_NetOccurrencesUnder::Locator::Locator(const HyperNet* hyperNet, Box are { if (_hyperNet) { Occurrence netOccurrence = _hyperNet->getNetOccurrence(); - if (netOccurrence.IsValid()) { + if (netOccurrence.isValid()) { _netOccurrenceSet.insert(netOccurrence); _netOccurrenceStack.push(netOccurrence); } @@ -746,13 +746,13 @@ Locator* HyperNet_NetOccurrencesUnder::Locator::getClone() const return new Locator(*this); } -bool HyperNet_NetOccurrencesUnder::Locator::IsValid() const +bool HyperNet_NetOccurrencesUnder::Locator::isValid() const // ******************************************************* { return !_netOccurrenceStack.empty(); } -void HyperNet_NetOccurrencesUnder::Locator::Progress() +void HyperNet_NetOccurrencesUnder::Locator::progress() // ************************************************** { if (!_netOccurrenceStack.empty()) { @@ -927,7 +927,7 @@ HyperNet_LeafPlugOccurrences::Locator::Locator(const HyperNet* hyperNet, bool do { if (hyperNet) { _netOccurrenceLocator = hyperNet->getNetOccurrences(doExtraction,allowInterruption).getLocator(); - Progress(); + progress(); } } @@ -959,21 +959,21 @@ Locator* HyperNet_LeafPlugOccurrences::Locator::getClone() const return new Locator(*this); } -bool HyperNet_LeafPlugOccurrences::Locator::IsValid() const +bool HyperNet_LeafPlugOccurrences::Locator::isValid() const // ************************************************** { - return _plugOccurrence.IsValid(); + return _plugOccurrence.isValid(); } -void HyperNet_LeafPlugOccurrences::Locator::Progress() +void HyperNet_LeafPlugOccurrences::Locator::progress() // ********************************************* { _plugOccurrence = Occurrence(); - while(_netOccurrenceLocator.IsValid() && !_plugOccurrence.IsValid()) + while(_netOccurrenceLocator.isValid() && !_plugOccurrence.isValid()) { Occurrence netOccurrence = _netOccurrenceLocator.getElement(); - _netOccurrenceLocator.Progress(); + _netOccurrenceLocator.progress(); Net* net = (Net*)netOccurrence.getEntity(); Path path = netOccurrence.getPath(); if (!path.IsEmpty() && net->getCell()->IsLeaf()) diff --git a/hurricane/src/hurricane/HyperNet.h b/hurricane/src/hurricane/HyperNet.h index 090560d9..08d4afd9 100644 --- a/hurricane/src/hurricane/HyperNet.h +++ b/hurricane/src/hurricane/HyperNet.h @@ -51,7 +51,7 @@ class HyperNet { // Predicates // ********** - public: bool IsValid() const {return _netOccurrence.IsValid();}; + public: bool isValid() const {return _netOccurrence.isValid();}; // Others // ****** diff --git a/hurricane/src/hurricane/Instance.cpp b/hurricane/src/hurricane/Instance.cpp index 3abc1946..8f7690e5 100644 --- a/hurricane/src/hurricane/Instance.cpp +++ b/hurricane/src/hurricane/Instance.cpp @@ -50,7 +50,7 @@ class Instance_IsUnderFilter : public Filter { return new Instance_IsUnderFilter(*this); }; - public: virtual bool Accept(Instance* instance) const + public: virtual bool accept(Instance* instance) const // ************************************************** { return _area.intersect(instance->getBoundingBox()); @@ -75,7 +75,7 @@ class Instance_IsTerminalFilter : public Filter { public: virtual Filter* getClone() const {return new Instance_IsTerminalFilter(*this);}; - public: virtual bool Accept(Instance* instance) const {return instance->IsTerminal();}; + public: virtual bool accept(Instance* instance) const {return instance->IsTerminal();}; public: virtual string _getString() const {return "<" + _TName("Instance::IsTerminalFilter") + ">";}; @@ -92,7 +92,7 @@ class Instance_IsLeafFilter : public Filter { public: virtual Filter* getClone() const {return new Instance_IsLeafFilter(*this);}; - public: virtual bool Accept(Instance* instance) const {return instance->IsLeaf();}; + public: virtual bool accept(Instance* instance) const {return instance->IsLeaf();}; public: virtual string _getString() const {return "<" + _TName("Instance::IsLeafFilter") + ">";}; @@ -109,7 +109,7 @@ class Instance_IsUnplacedFilter : public Filter { public: virtual Filter* getClone() const {return new Instance_IsUnplacedFilter(*this);}; - public: virtual bool Accept(Instance* instance) const {return instance->IsUnplaced();}; + public: virtual bool accept(Instance* instance) const {return instance->IsUnplaced();}; public: virtual string _getString() const {return "<" + _TName("Net::IsUnplacedFilter>");}; @@ -126,7 +126,7 @@ class Instance_IsPlacedFilter : public Filter { public: virtual Filter* getClone() const {return new Instance_IsPlacedFilter(*this);}; - public: virtual bool Accept(Instance* instance) const {return instance->IsPlaced();}; + public: virtual bool accept(Instance* instance) const {return instance->IsPlaced();}; public: virtual string _getString() const {return "<" + _TName("Net::IsPlacedFilter>");}; @@ -143,7 +143,7 @@ class Instance_IsFixedFilter : public Filter { public: virtual Filter* getClone() const {return new Instance_IsFixedFilter(*this);}; - public: virtual bool Accept(Instance* instance) const {return instance->IsFixed();}; + public: virtual bool accept(Instance* instance) const {return instance->IsFixed();}; public: virtual string _getString() const {return "<" + _TName("Net::IsFixedFilter>");}; diff --git a/hurricane/src/hurricane/Instances.h b/hurricane/src/hurricane/Instances.h index 227b6305..20801718 100644 --- a/hurricane/src/hurricane/Instances.h +++ b/hurricane/src/hurricane/Instances.h @@ -47,9 +47,9 @@ typedef GenericFilter InstanceFilter; /*********************************************/\ {\ InstanceLocator _locator = instances.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Instance* instance = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Intervals.h b/hurricane/src/hurricane/Intervals.h index b4cc19cc..309358da 100644 --- a/hurricane/src/hurricane/Intervals.h +++ b/hurricane/src/hurricane/Intervals.h @@ -46,9 +46,9 @@ typedef GenericFilter IntervalFilter; /*********************************************/\ {\ IntervalLocator _locator = intervals.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Interval interval = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/IntrusiveMap.h b/hurricane/src/hurricane/IntrusiveMap.h index 56359128..5656f37b 100644 --- a/hurricane/src/hurricane/IntrusiveMap.h +++ b/hurricane/src/hurricane/IntrusiveMap.h @@ -106,7 +106,7 @@ template class IntrusiveMap { // Predicates // ********** - public: virtual bool IsValid() const + public: virtual bool isValid() const // ********************************* { return (_element != NULL); @@ -115,7 +115,7 @@ template class IntrusiveMap { // Updators // ******** - public: virtual void Progress() + public: virtual void progress() // **************************** { if (_element) { diff --git a/hurricane/src/hurricane/IntrusiveSet.h b/hurricane/src/hurricane/IntrusiveSet.h index 29738b28..71deb53f 100644 --- a/hurricane/src/hurricane/IntrusiveSet.h +++ b/hurricane/src/hurricane/IntrusiveSet.h @@ -106,7 +106,7 @@ template class IntrusiveSet : public NestedSlotAdapter { // Predicates // ********** - public: virtual bool IsValid() const + public: virtual bool isValid() const // ********************************* { return (_element != NULL); @@ -115,7 +115,7 @@ template class IntrusiveSet : public NestedSlotAdapter { // Updators // ******** - public: virtual void Progress() + public: virtual void progress() // **************************** { if (_element) { diff --git a/hurricane/src/hurricane/Layers.h b/hurricane/src/hurricane/Layers.h index 62b88172..7cd3e50f 100644 --- a/hurricane/src/hurricane/Layers.h +++ b/hurricane/src/hurricane/Layers.h @@ -47,9 +47,9 @@ typedef GenericFilter LayerFilter; /************************************/\ {\ LayerLocator _locator = layers.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Layer* layer = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Libraries.h b/hurricane/src/hurricane/Libraries.h index 6aaba5ed..b25a6cd0 100644 --- a/hurricane/src/hurricane/Libraries.h +++ b/hurricane/src/hurricane/Libraries.h @@ -47,9 +47,9 @@ typedef GenericFilter LibraryFilter; /*******************************************/\ {\ LibraryLocator _locator = libraries.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Library* library = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/ListCollection.h b/hurricane/src/hurricane/ListCollection.h index 674f0b24..8f3f8b88 100644 --- a/hurricane/src/hurricane/ListCollection.h +++ b/hurricane/src/hurricane/ListCollection.h @@ -47,7 +47,7 @@ template class ListCollection : public Collection { public: virtual Element getElement() const // *************************************** { - return (IsValid()) ? *_iterator : Element(); + return (isValid()) ? *_iterator : Element(); }; public: virtual Hurricane::Locator* getClone() const @@ -56,13 +56,13 @@ template class ListCollection : public Collection { return new Locator(_elementList); }; - public: virtual bool IsValid() const + public: virtual bool isValid() const // ********************************* { return (_elementList && (_iterator != _elementList->end())); }; - public: virtual void Progress() + public: virtual void progress() // **************************** { ++_iterator; diff --git a/hurricane/src/hurricane/Locator.h b/hurricane/src/hurricane/Locator.h index 65e096bc..b71a38bf 100644 --- a/hurricane/src/hurricane/Locator.h +++ b/hurricane/src/hurricane/Locator.h @@ -65,12 +65,12 @@ template class Locator : public NestedSlotAdapter { // Predicates // ********** - public: virtual bool IsValid() const = 0; + public: virtual bool isValid() const = 0; // Updators // ******** - public: virtual void Progress() = 0; + public: virtual void progress() = 0; // Others // ****** @@ -84,7 +84,7 @@ template class Locator : public NestedSlotAdapter { public: virtual string _getString() const // ************************************** { - if (!IsValid()) + if (!isValid()) return "<" + _getTypeName() + " invalid>"; else return "<" + _getTypeName() + " " + getString(getElement()) + ">"; @@ -207,19 +207,19 @@ template class GenericLocator : public Locator { // Predicates // ********** - public: virtual bool IsValid() const + public: virtual bool isValid() const // ********************************* { - return (_locator && _locator->IsValid()); + return (_locator && _locator->isValid()); }; // Updators // ******** - public: virtual void Progress() + public: virtual void progress() // **************************** { - if (_locator) _locator->Progress(); + if (_locator) _locator->progress(); }; // Others diff --git a/hurricane/src/hurricane/MapCollection.h b/hurricane/src/hurricane/MapCollection.h index ae378062..c0f9aec7 100644 --- a/hurricane/src/hurricane/MapCollection.h +++ b/hurricane/src/hurricane/MapCollection.h @@ -48,7 +48,7 @@ template > public: virtual Element GetElement() const // *************************************** { - return (IsValid()) ? (*_iterator).second : Element(); + return (isValid()) ? (*_iterator).second : Element(); }; public: virtual Hurricane::Locator* GetClone() const @@ -57,13 +57,13 @@ template > return new Locator(_elementMap); }; - public: virtual bool IsValid() const + public: virtual bool isValid() const // ********************************* { return (_elementMap && (_iterator != _elementMap->end())); }; - public: virtual void Progress() + public: virtual void progress() // **************************** { ++_iterator; diff --git a/hurricane/src/hurricane/Markers.h b/hurricane/src/hurricane/Markers.h index 0a4c216d..25e03ce4 100644 --- a/hurricane/src/hurricane/Markers.h +++ b/hurricane/src/hurricane/Markers.h @@ -47,9 +47,9 @@ typedef GenericFilter MarkerFilter; /***************************************/\ {\ MarkerLocator _locator = markers.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Marker* marker = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/MultisetCollection.h b/hurricane/src/hurricane/MultisetCollection.h index dc4a61df..612d72ac 100644 --- a/hurricane/src/hurricane/MultisetCollection.h +++ b/hurricane/src/hurricane/MultisetCollection.h @@ -53,7 +53,7 @@ template > public: virtual Element getElement() const // *************************************** { - return (IsValid()) ? *_iterator : Element(); + return (isValid()) ? *_iterator : Element(); }; public: virtual Hurricane::Locator* getClone() const @@ -62,13 +62,13 @@ template > return new Locator(_elementMultiset); }; - public: virtual bool IsValid() const + public: virtual bool isValid() const // ********************************* { return (_elementMultiset && (_iterator != _elementMultiset->end())); }; - public: virtual void Progress() + public: virtual void progress() // **************************** { ++_iterator; diff --git a/hurricane/src/hurricane/Names.h b/hurricane/src/hurricane/Names.h index b496a272..476672aa 100644 --- a/hurricane/src/hurricane/Names.h +++ b/hurricane/src/hurricane/Names.h @@ -46,9 +46,9 @@ typedef GenericFilter NameFilter; /****************************************************/\ {\ NameLocator _locator = names.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Name* name = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); } // End of Hurricane namespace. diff --git a/hurricane/src/hurricane/Net.cpp b/hurricane/src/hurricane/Net.cpp index 19409b35..d60020b3 100644 --- a/hurricane/src/hurricane/Net.cpp +++ b/hurricane/src/hurricane/Net.cpp @@ -37,7 +37,7 @@ class Net_IsCellNetFilter : public Filter { public: virtual Filter* getClone() const {return new Net_IsCellNetFilter(*this);}; - public: virtual bool Accept(Net* net) const {return !net->IsDeepNet();}; + public: virtual bool accept(Net* net) const {return !net->IsDeepNet();}; public: virtual string _getString() const {return "<" + _TName("Net::IsCellNetFilter>");}; @@ -54,7 +54,7 @@ class Net_IsDeepNetFilter : public Filter { public: virtual Filter* getClone() const {return new Net_IsDeepNetFilter(*this);}; - public: virtual bool Accept(Net* net) const {return net->IsDeepNet();}; + public: virtual bool accept(Net* net) const {return net->IsDeepNet();}; public: virtual string _getString() const {return "<" + _TName("Net::IsDeepNetFilter>");}; @@ -71,7 +71,7 @@ class Net_IsGlobalFilter : public Filter { public: virtual Filter* getClone() const {return new Net_IsGlobalFilter(*this);}; - public: virtual bool Accept(Net* net) const {return net->IsGlobal();}; + public: virtual bool accept(Net* net) const {return net->IsGlobal();}; public: virtual string _getString() const {return "<" + _TName("Net::IsGlobalFilter>");}; @@ -88,7 +88,7 @@ class Net_IsExternalFilter : public Filter { public: virtual Filter* getClone() const {return new Net_IsExternalFilter(*this);}; - public: virtual bool Accept(Net* net) const {return net->IsExternal();}; + public: virtual bool accept(Net* net) const {return net->IsExternal();}; public: virtual string _getString() const {return "<" + _TName("Net::IsExternalFilter>");}; @@ -105,7 +105,7 @@ class Net_IsClockFilter : public Filter { public: virtual Filter* getClone() const {return new Net_IsClockFilter(*this);}; - public: virtual bool Accept(Net* net) const {return net->IsClock();}; + public: virtual bool accept(Net* net) const {return net->IsClock();}; public: virtual string _getString() const {return "<" + _TName("Net::IsClockFilter>");}; @@ -122,7 +122,7 @@ class Net_IsSupplyFilter : public Filter { public: virtual Filter* getClone() const {return new Net_IsSupplyFilter(*this);}; - public: virtual bool Accept(Net* net) const {return net->IsSupply();}; + public: virtual bool accept(Net* net) const {return net->IsSupply();}; public: virtual string _getString() const {return "<" + _TName("Net::IsSupplyFilter>");}; @@ -139,7 +139,7 @@ class Net_IsPowerFilter : public Filter { public: virtual Filter* getClone() const {return new Net_IsPowerFilter(*this);}; - public: virtual bool Accept(Net* net) const {return net->IsPower();}; + public: virtual bool accept(Net* net) const {return net->IsPower();}; public: virtual string _getString() const {return "<" + _TName("Net::IsPowerFilter>");}; @@ -156,7 +156,7 @@ class Net_IsGroundFilter : public Filter { public: virtual Filter* getClone() const {return new Net_IsGroundFilter(*this);}; - public: virtual bool Accept(Net* net) const {return net->IsGround();}; + public: virtual bool accept(Net* net) const {return net->IsGround();}; public: virtual string _getString() const {return "<" + _TName("Net::IsGroundFilter>");}; @@ -193,9 +193,9 @@ class Net_SlavePlugs : public Collection { public: virtual Plug* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -858,9 +858,9 @@ Net_SlavePlugs::Locator::Locator(const Net* net) { if (_net) { _instanceLocator = _net->getCell()->getSlaveInstances().getLocator(); - while (!_plug && _instanceLocator.IsValid()) { + while (!_plug && _instanceLocator.isValid()) { _plug = _instanceLocator.getElement()->getPlug(_net); - _instanceLocator.Progress(); + _instanceLocator.progress(); } } } @@ -895,20 +895,20 @@ Locator* Net_SlavePlugs::Locator::getClone() const return new Locator(*this); } -bool Net_SlavePlugs::Locator::IsValid() const +bool Net_SlavePlugs::Locator::isValid() const // ****************************************** { return (_plug != NULL); } -void Net_SlavePlugs::Locator::Progress() +void Net_SlavePlugs::Locator::progress() // ************************************* { - if (IsValid()) { + if (isValid()) { _plug = NULL; - while (!_plug && _instanceLocator.IsValid()) { + while (!_plug && _instanceLocator.isValid()) { _plug = _instanceLocator.getElement()->getPlug(_net); - _instanceLocator.Progress(); + _instanceLocator.progress(); } } } diff --git a/hurricane/src/hurricane/Nets.h b/hurricane/src/hurricane/Nets.h index eae3df3d..ad6520ec 100644 --- a/hurricane/src/hurricane/Nets.h +++ b/hurricane/src/hurricane/Nets.h @@ -47,9 +47,9 @@ typedef GenericFilter NetFilter; /******************************/\ {\ NetLocator _locator = nets.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Net* net = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Occurrence.h b/hurricane/src/hurricane/Occurrence.h index 0242f3d1..fe51540a 100644 --- a/hurricane/src/hurricane/Occurrence.h +++ b/hurricane/src/hurricane/Occurrence.h @@ -63,7 +63,7 @@ class Occurrence { // Predicates // ********** - public: bool IsValid() const {return (_entity != NULL);}; + public: bool isValid() const {return (_entity != NULL);}; public: bool HasProperty() const; // Updators diff --git a/hurricane/src/hurricane/Occurrences.h b/hurricane/src/hurricane/Occurrences.h index 8e028ed0..6fdeb90a 100644 --- a/hurricane/src/hurricane/Occurrences.h +++ b/hurricane/src/hurricane/Occurrences.h @@ -46,9 +46,9 @@ typedef GenericFilter OccurrenceFilter; /************************************************/\ {\ OccurrenceLocator _locator = occurrences.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Occurrence occurrence = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Pads.h b/hurricane/src/hurricane/Pads.h index 36fa75e3..b7cabcbf 100644 --- a/hurricane/src/hurricane/Pads.h +++ b/hurricane/src/hurricane/Pads.h @@ -47,9 +47,9 @@ typedef GenericFilter PadFilter; /******************************/\ {\ PadLocator _locator = pads.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Pad* pad = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Pathes.h b/hurricane/src/hurricane/Pathes.h index ad472bea..e4766333 100644 --- a/hurricane/src/hurricane/Pathes.h +++ b/hurricane/src/hurricane/Pathes.h @@ -46,9 +46,9 @@ typedef GenericFilter PathFilter; /**********************************/\ {\ PathLocator _locator = pathes.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Path path = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Pins.h b/hurricane/src/hurricane/Pins.h index 2d02fa7d..54079cfd 100644 --- a/hurricane/src/hurricane/Pins.h +++ b/hurricane/src/hurricane/Pins.h @@ -51,9 +51,9 @@ typedef GenericFilter PinFilter; /******************************/\ {\ PinLocator _locator = pins.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Pin* pin = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Plug.cpp b/hurricane/src/hurricane/Plug.cpp index 85f1c42a..c435f3bd 100644 --- a/hurricane/src/hurricane/Plug.cpp +++ b/hurricane/src/hurricane/Plug.cpp @@ -29,7 +29,7 @@ class Plug_IsConnectedFilter : public Filter { public: virtual Filter* getClone() const {return new Plug_IsConnectedFilter(*this);}; - public: virtual bool Accept(Plug* plug) const {return plug->IsConnected();}; + public: virtual bool accept(Plug* plug) const {return plug->IsConnected();}; public: virtual string _getString() const {return "<" + _TName("Plug::IsConnectedFilter>");}; diff --git a/hurricane/src/hurricane/Plugs.h b/hurricane/src/hurricane/Plugs.h index 6fbfa3b3..fcfef402 100644 --- a/hurricane/src/hurricane/Plugs.h +++ b/hurricane/src/hurricane/Plugs.h @@ -47,9 +47,9 @@ typedef GenericFilter PlugFilter; /*********************************/\ {\ PlugLocator _locator = plugs.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Plug* plug = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Points.h b/hurricane/src/hurricane/Points.h index 6fba9d9a..8939b5b4 100644 --- a/hurricane/src/hurricane/Points.h +++ b/hurricane/src/hurricane/Points.h @@ -46,9 +46,9 @@ typedef GenericFilter PointFilter; /************************************/\ {\ PointLocator _locator = points.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Point point = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Primitives.h b/hurricane/src/hurricane/Primitives.h index bfef7119..db047d32 100644 --- a/hurricane/src/hurricane/Primitives.h +++ b/hurricane/src/hurricane/Primitives.h @@ -47,9 +47,9 @@ typedef GenericFilter PrimitiveFilter; /************************************************/\ {\ PrimitiveLocator _locator = primitives.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Primitive* primitive = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Properties.h b/hurricane/src/hurricane/Properties.h index eaa26221..18369306 100644 --- a/hurricane/src/hurricane/Properties.h +++ b/hurricane/src/hurricane/Properties.h @@ -47,9 +47,9 @@ typedef GenericFilter PropertyFilter; /**********************************************/\ {\ PropertyLocator _locator = properties.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Property* property = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/QuadTree.cpp b/hurricane/src/hurricane/QuadTree.cpp index e6bd5dc1..17f41f18 100644 --- a/hurricane/src/hurricane/QuadTree.cpp +++ b/hurricane/src/hurricane/QuadTree.cpp @@ -50,9 +50,9 @@ class QuadTree_Gos : public Collection { public: virtual Go* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -120,9 +120,9 @@ class QuadTree_GosUnder : public Collection { public: virtual Go* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -627,18 +627,18 @@ Locator* QuadTree_Gos::Locator::getClone() const return new Locator(*this); } -bool QuadTree_Gos::Locator::IsValid() const +bool QuadTree_Gos::Locator::isValid() const // **************************************** { - return _goLocator.IsValid(); + return _goLocator.isValid(); } -void QuadTree_Gos::Locator::Progress() +void QuadTree_Gos::Locator::progress() // *********************************** { - if (IsValid()) { - _goLocator.Progress(); - if (!_goLocator.IsValid()) { + if (isValid()) { + _goLocator.progress(); + if (!_goLocator.isValid()) { _currentQuadTree = _currentQuadTree->_getNextQuadTree(); if (_currentQuadTree) _goLocator = _currentQuadTree->_getGoSet().getElements().getLocator(); @@ -745,7 +745,7 @@ QuadTree_GosUnder::Locator::Locator(const QuadTree* quadTree, const Box& area) _currentQuadTree = _quadTree->_getFirstQuadTree(_area); if (_currentQuadTree) { _goLocator = _currentQuadTree->_getGoSet().getElements().getLocator(); - if (!getElement()->getBoundingBox().intersect(_area)) Progress(); + if (!getElement()->getBoundingBox().intersect(_area)) progress(); } } } @@ -782,24 +782,24 @@ Locator* QuadTree_GosUnder::Locator::getClone() const return new Locator(*this); } -bool QuadTree_GosUnder::Locator::IsValid() const +bool QuadTree_GosUnder::Locator::isValid() const // ********************************************* { - return _goLocator.IsValid(); + return _goLocator.isValid(); } -void QuadTree_GosUnder::Locator::Progress() +void QuadTree_GosUnder::Locator::progress() // **************************************** { - if (IsValid()) { + if (isValid()) { do { - _goLocator.Progress(); - if (!_goLocator.IsValid()) { + _goLocator.progress(); + if (!_goLocator.isValid()) { _currentQuadTree = _currentQuadTree->_getNextQuadTree(_area); if (_currentQuadTree) _goLocator = _currentQuadTree->_getGoSet().getElements().getLocator(); } - } while (IsValid() && !getElement()->getBoundingBox().intersect(_area)); + } while (isValid() && !getElement()->getBoundingBox().intersect(_area)); } } diff --git a/hurricane/src/hurricane/Quark.cpp b/hurricane/src/hurricane/Quark.cpp index 1de8f706..8e7b7095 100644 --- a/hurricane/src/hurricane/Quark.cpp +++ b/hurricane/src/hurricane/Quark.cpp @@ -33,7 +33,7 @@ Quark::Quark(const Occurrence& occurrence) _occurrence(occurrence), _nextOfSharedPathQuarkMap(NULL) { - if (!_occurrence.IsValid()) + if (!_occurrence.isValid()) throw Error("Can't create " + _TName("Quark") + " : invalid occurrence"); if (_occurrence._getQuark()) diff --git a/hurricane/src/hurricane/Quarks.h b/hurricane/src/hurricane/Quarks.h index 423d7308..e88721e6 100644 --- a/hurricane/src/hurricane/Quarks.h +++ b/hurricane/src/hurricane/Quarks.h @@ -47,9 +47,9 @@ typedef GenericFilter QuarkFilter; /************************************/\ {\ QuarkLocator _locator = quarks.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Quark* quark = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/References.h b/hurricane/src/hurricane/References.h index 81dc01b0..f6e0b24e 100644 --- a/hurricane/src/hurricane/References.h +++ b/hurricane/src/hurricane/References.h @@ -47,9 +47,9 @@ typedef GenericFilter ReferenceFilter; /***************************************/\ {\ ReferenceLocator _locator = references.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Reference* reference = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Region.cpp b/hurricane/src/hurricane/Region.cpp index be19b0be..c687e580 100644 --- a/hurricane/src/hurricane/Region.cpp +++ b/hurricane/src/hurricane/Region.cpp @@ -46,7 +46,7 @@ class Region_Tile { public: virtual Filter* getClone() const; - public: virtual bool Accept(Region_Tile* tile) const; + public: virtual bool accept(Region_Tile* tile) const; public: virtual string _getString() const; @@ -983,7 +983,7 @@ Filter* Region_Tile::IsVoidFilter::getClone() const return new Region_Tile::IsVoidFilter(*this); } -bool Region_Tile::IsVoidFilter::Accept(Region_Tile* tile) const +bool Region_Tile::IsVoidFilter::accept(Region_Tile* tile) const // ************************************************************ { return tile->IsVoid(); @@ -1025,9 +1025,9 @@ class Region_Tiles : public Collection { public: virtual Region_Tile* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -1159,13 +1159,13 @@ Locator* Region_Tiles::Locator::getClone() const return new Locator(*this); } -bool Region_Tiles::Locator::IsValid() const +bool Region_Tiles::Locator::isValid() const // *************************************** { return !_tileStack.empty(); } -void Region_Tiles::Locator::Progress() +void Region_Tiles::Locator::progress() // ********************************** { if (!_tileStack.empty()) { @@ -1224,9 +1224,9 @@ class Region_TilesUnder : public Collection { public: virtual Region_Tile* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -1402,13 +1402,13 @@ Locator* Region_TilesUnder::Locator::getClone() const return new Locator(*this); } -bool Region_TilesUnder::Locator::IsValid() const +bool Region_TilesUnder::Locator::isValid() const // ********************************************* { return !_tileStack.empty(); } -void Region_TilesUnder::Locator::Progress() +void Region_TilesUnder::Locator::progress() // **************************************** { if (!_tileStack.empty()) { @@ -1476,9 +1476,9 @@ class Region_BoxesUnder : public Collection { public: virtual Box getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -1628,7 +1628,7 @@ Region_BoxesUnder::Locator& Region_BoxesUnder::Locator::operator=(const Locator& Box Region_BoxesUnder::Locator::getElement() const // *********************************************** { - return (_tileLocator.IsValid()) ? _tileLocator.getElement()->getBoundingBox() : Box(); + return (_tileLocator.isValid()) ? _tileLocator.getElement()->getBoundingBox() : Box(); } Locator* Region_BoxesUnder::Locator::getClone() const @@ -1637,16 +1637,16 @@ Locator* Region_BoxesUnder::Locator::getClone() const return new Locator(*this); } -bool Region_BoxesUnder::Locator::IsValid() const +bool Region_BoxesUnder::Locator::isValid() const // ******************************************** { - return _tileLocator.IsValid(); + return _tileLocator.isValid(); } -void Region_BoxesUnder::Locator::Progress() +void Region_BoxesUnder::Locator::progress() // **************************************** { - _tileLocator.Progress(); + _tileLocator.progress(); } string Region_BoxesUnder::Locator::_getString() const @@ -1693,9 +1693,9 @@ class Region_VoidBoxesUnder : public Collection { public: virtual Box getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -1845,7 +1845,7 @@ Region_VoidBoxesUnder::Locator& Region_VoidBoxesUnder::Locator::operator=(const Box Region_VoidBoxesUnder::Locator::getElement() const // *************************************************** { - return (_tileLocator.IsValid()) ? _tileLocator.getElement()->getBoundingBox() : Box(); + return (_tileLocator.isValid()) ? _tileLocator.getElement()->getBoundingBox() : Box(); } Locator* Region_VoidBoxesUnder::Locator::getClone() const @@ -1854,16 +1854,16 @@ Locator* Region_VoidBoxesUnder::Locator::getClone() const return new Locator(*this); } -bool Region_VoidBoxesUnder::Locator::IsValid() const +bool Region_VoidBoxesUnder::Locator::isValid() const // ************************************************* { - return _tileLocator.IsValid(); + return _tileLocator.isValid(); } -void Region_VoidBoxesUnder::Locator::Progress() +void Region_VoidBoxesUnder::Locator::progress() // ******************************************** { - _tileLocator.Progress(); + _tileLocator.progress(); } string Region_VoidBoxesUnder::Locator::_getString() const @@ -1909,9 +1909,9 @@ class Region_Intervals : public Collection { public: virtual Interval getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -2068,7 +2068,7 @@ Region_Intervals::Locator& Region_Intervals::Locator::operator=(const Locator& l Interval Region_Intervals::Locator::getElement() const // *************************************************** { - if (!IsValid()) return Interval(); + if (!isValid()) return Interval(); Interval interval; switch (_swapLine->getType()) { @@ -2091,16 +2091,16 @@ Locator* Region_Intervals::Locator::getClone() const return new Locator(*this); } -bool Region_Intervals::Locator::IsValid() const +bool Region_Intervals::Locator::isValid() const // ******************************************** { return (_lowerTile && _upperTile); } -void Region_Intervals::Locator::Progress() +void Region_Intervals::Locator::progress() // *************************************** { - if (IsValid()) { + if (isValid()) { switch (_swapLine->getType()) { case Region::SwapLine::Type::VERTICAL : { Unit x = _swapLine->getPosition(); @@ -2298,10 +2298,10 @@ Intervals Region::SwapLine::getIntervals() const return Region_Intervals(this); } -void Region::SwapLine::Progress(int n) +void Region::SwapLine::progress(int n) // *************************** { - if (IsValid() && n) { + if (isValid() && n) { if (0 < n) { switch (_type) { case Type::VERTICAL : { @@ -2396,7 +2396,7 @@ string Region::SwapLine::_getString() const // **************************************** { string s = "<" + _getTypeName() + ">"; - if (IsValid()) { + if (isValid()) { s.insert(s.length() - 1, " " + getString(_type)); s.insert(s.length() - 1, " " + getString(_position)); s.insert(s.length() - 1, " " + getString(_extention)); diff --git a/hurricane/src/hurricane/Region.h b/hurricane/src/hurricane/Region.h index 5819c708..9d68a199 100644 --- a/hurricane/src/hurricane/Region.h +++ b/hurricane/src/hurricane/Region.h @@ -93,12 +93,12 @@ class Region { // Predicates // ********** - public: bool IsValid() const {return _baseTile;}; + public: bool isValid() const {return _baseTile;}; // Updators // ******** - public: void Progress(int n = 1); + public: void progress(int n = 1); public: void Translate(const Unit& quantity); public: void SetPosition(const Unit& position); diff --git a/hurricane/src/hurricane/Relation.cpp b/hurricane/src/hurricane/Relation.cpp index 74315f9c..7ecbe9ea 100644 --- a/hurricane/src/hurricane/Relation.cpp +++ b/hurricane/src/hurricane/Relation.cpp @@ -48,7 +48,7 @@ class Relation_OwnerIsSlave : public Filter { return new Relation_OwnerIsSlave(*this); }; - public: virtual bool Accept(DBo* owner) const + public: virtual bool accept(DBo* owner) const // ****************************************** { return (owner != _relation->getMasterOwner()); diff --git a/hurricane/src/hurricane/RoutingPad.cpp b/hurricane/src/hurricane/RoutingPad.cpp index 9b8964f0..27733ef5 100644 --- a/hurricane/src/hurricane/RoutingPad.cpp +++ b/hurricane/src/hurricane/RoutingPad.cpp @@ -42,7 +42,7 @@ RoutingPad* RoutingPad::create(Net* net, Occurrence occurrence) { if (!net) throw Error ("Can't create RoutingPad : NULL net"); - if (!occurrence.IsValid()) + if (!occurrence.isValid()) throw Error ("Can't create RoutingPag : Invalid occurrence"); //TODO Gerer une contruction avec un composant externe, mais ce n'est pas prioritaire @@ -258,7 +258,7 @@ Record* RoutingPad::_getRecord() const Component* RoutingPad::_getEntityAsComponent () const // *************************************************** { - if ( _occurrence.IsValid() ) + if ( _occurrence.isValid() ) return dynamic_cast( _occurrence.getEntity() ); return NULL; @@ -267,55 +267,12 @@ Component* RoutingPad::_getEntityAsComponent () const Segment* RoutingPad::_getEntityAsSegment () const // *********************************************** { - if ( _occurrence.IsValid() ) + if ( _occurrence.isValid() ) return dynamic_cast( _occurrence.getEntity() ); return NULL; } -//bool RoutingPad::_IsInterceptedBy(View* view, const Point& point, const Unit& aperture) const -//// ****************************************************************************************** -//{ -// Layer* layer = getLayer(); -// Box boundingBox ( getBoundingBox() ); -// Box area ( point ); -// -// area.Inflate ( aperture ); -// -// for_each_basic_layer(basicLayer, layer->getBasicLayers()) { -// if (view->IsVisible(basicLayer)) -// if (boundingBox.Intersect(area)) return true; -// end_for; -// } -// -// return false; -//} -// -// -//void RoutingPad::_Draw(View* view, BasicLayer* basicLayer, const Box& updateArea, const Transformation& transformation) -//// **************************************************************************************************** -//{ -// Box boundingBox ( getBoundingBox() ); -// BasicLayer* layer = getLayer()->_getSymbolicBasicLayer(); -// -// if ( basicLayer == layer ) { -// if ( 1 < view->getScreenSize(boundingBox.getWidth()) ) { -// view->DrawRectangle ( boundingBox ); -// } -// else -// view->DrawLine ( getSourcePosition(), getTargetPosition() ); -// } -//} -// -// -//void RoutingPad::_Highlight(View* view, const Box& updateArea, const Transformation& transformation) -//// ********************************************************************************************** -//{ -// BasicLayer* layer = getLayer()->_getSymbolicBasicLayer(); -// _Draw ( view, layer, updateArea, transformation ); -//} - - void RoutingPad::SetExternalComponent(Component* component) // ******************************************************** { diff --git a/hurricane/src/hurricane/RoutingPads.h b/hurricane/src/hurricane/RoutingPads.h index 624efc34..ae819837 100644 --- a/hurricane/src/hurricane/RoutingPads.h +++ b/hurricane/src/hurricane/RoutingPads.h @@ -51,9 +51,9 @@ typedef GenericFilter RoutingPadFilter; /*********************************/\ {\ RoutingPadLocator _locator = routingpads.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ RoutingPad* routingpad = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Rubbers.h b/hurricane/src/hurricane/Rubbers.h index 95b7a46e..6697d765 100644 --- a/hurricane/src/hurricane/Rubbers.h +++ b/hurricane/src/hurricane/Rubbers.h @@ -47,9 +47,9 @@ typedef GenericFilter RubberFilter; /***************************************/\ {\ RubberLocator _locator = rubbers.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Rubber* rubber = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Segment.cpp b/hurricane/src/hurricane/Segment.cpp index 38a91ccb..0f1f4fb0 100644 --- a/hurricane/src/hurricane/Segment.cpp +++ b/hurricane/src/hurricane/Segment.cpp @@ -42,9 +42,9 @@ class Segment_Hooks : public Collection { public: virtual Hook* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -109,9 +109,9 @@ class Segment_Anchors : public Collection { public: virtual Component* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -519,13 +519,13 @@ Locator* Segment_Hooks::Locator::getClone() const return new Locator(*this); } -bool Segment_Hooks::Locator::IsValid() const +bool Segment_Hooks::Locator::isValid() const // ***************************************** { return (_hook != NULL); } -void Segment_Hooks::Locator::Progress() +void Segment_Hooks::Locator::progress() // ************************************ { if (_hook) { @@ -643,13 +643,13 @@ Locator* Segment_Anchors::Locator::getClone() const return new Locator(*this); } -bool Segment_Anchors::Locator::IsValid() const +bool Segment_Anchors::Locator::isValid() const // ******************************************* { return (_anchor != NULL); } -void Segment_Anchors::Locator::Progress() +void Segment_Anchors::Locator::progress() // ************************************** { if (_anchor) { diff --git a/hurricane/src/hurricane/Segments.h b/hurricane/src/hurricane/Segments.h index a20620ec..5691e3de 100644 --- a/hurricane/src/hurricane/Segments.h +++ b/hurricane/src/hurricane/Segments.h @@ -47,9 +47,9 @@ typedef GenericFilter SegmentFilter; /******************************************/\ {\ SegmentLocator _locator = segments.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Segment* segment = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Selectors.h b/hurricane/src/hurricane/Selectors.h index fbedf55c..b4bbfd33 100644 --- a/hurricane/src/hurricane/Selectors.h +++ b/hurricane/src/hurricane/Selectors.h @@ -47,9 +47,9 @@ typedef GenericFilter SelectorFilter; /*********************************************/\ {\ SelectorLocator _locator = selectors.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Selector* selector = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/SetCollection.h b/hurricane/src/hurricane/SetCollection.h index c5eb63b5..a7e2cb56 100644 --- a/hurricane/src/hurricane/SetCollection.h +++ b/hurricane/src/hurricane/SetCollection.h @@ -53,7 +53,7 @@ template > public: virtual Element getElement() const // *************************************** { - return (IsValid()) ? *_iterator : Element(); + return (isValid()) ? *_iterator : Element(); }; public: virtual Hurricane::Locator* getClone() const @@ -62,13 +62,13 @@ template > return new Locator(_elementSet); }; - public: virtual bool IsValid() const + public: virtual bool isValid() const // ********************************* { return (_elementSet && (_iterator != _elementSet->end())); }; - public: virtual void Progress() + public: virtual void progress() // **************************** { ++_iterator; diff --git a/hurricane/src/hurricane/SharedPath.cpp b/hurricane/src/hurricane/SharedPath.cpp index 224cc1e3..849720f6 100644 --- a/hurricane/src/hurricane/SharedPath.cpp +++ b/hurricane/src/hurricane/SharedPath.cpp @@ -40,9 +40,9 @@ class SharedPath_Instances : public Collection { public: virtual Instance* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; }; @@ -341,13 +341,13 @@ Locator* SharedPath_Instances::Locator::getClone() const return new Locator(*this); } -bool SharedPath_Instances::Locator::IsValid() const +bool SharedPath_Instances::Locator::isValid() const // ************************************************ { return (_sharedPath != NULL); } -void SharedPath_Instances::Locator::Progress() +void SharedPath_Instances::Locator::progress() // ******************************************* { if (_sharedPath) _sharedPath = _sharedPath->getTailSharedPath(); diff --git a/hurricane/src/hurricane/SharedPathes.h b/hurricane/src/hurricane/SharedPathes.h index 44a9ad31..63b115a1 100644 --- a/hurricane/src/hurricane/SharedPathes.h +++ b/hurricane/src/hurricane/SharedPathes.h @@ -47,9 +47,9 @@ typedef GenericFilter SharedPathFilter; /*****************************************************/\ {\ SharedPathLocator _locator = sharedPathes.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ SharedPath* sharedPath = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Slices.h b/hurricane/src/hurricane/Slices.h index a91b2766..10eeeba4 100644 --- a/hurricane/src/hurricane/Slices.h +++ b/hurricane/src/hurricane/Slices.h @@ -47,9 +47,9 @@ typedef GenericFilter SliceFilter; /************************************/\ {\ SliceLocator _locator = slices.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Slice* slice = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Symbols.h b/hurricane/src/hurricane/Symbols.h index 9dc43d9b..0d4904aa 100644 --- a/hurricane/src/hurricane/Symbols.h +++ b/hurricane/src/hurricane/Symbols.h @@ -47,9 +47,9 @@ typedef GenericFilter SymbolFilter; /***************************************/\ {\ SymbolLocator _locator = symbols.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Symbol* symbol = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Technology.cpp b/hurricane/src/hurricane/Technology.cpp index 68a188f3..f940b287 100644 --- a/hurricane/src/hurricane/Technology.cpp +++ b/hurricane/src/hurricane/Technology.cpp @@ -47,9 +47,9 @@ class Technology_BasicLayers : public Collection { public: virtual BasicLayer* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -321,8 +321,8 @@ Technology_BasicLayers::Locator::Locator(const Technology* technology, const Lay { if (_technology) { _basicLayerLocator = _technology->getBasicLayers().getLocator(); - while (_basicLayerLocator.IsValid() && !(_basicLayerLocator.getElement()->getMask() & _mask)) - _basicLayerLocator.Progress(); + while (_basicLayerLocator.isValid() && !(_basicLayerLocator.getElement()->getMask() & _mask)) + _basicLayerLocator.progress(); } } @@ -356,19 +356,19 @@ Locator* Technology_BasicLayers::Locator::getClone() const return new Locator(*this); } -bool Technology_BasicLayers::Locator::IsValid() const +bool Technology_BasicLayers::Locator::isValid() const // ************************************************** { - return _basicLayerLocator.IsValid(); + return _basicLayerLocator.isValid(); } -void Technology_BasicLayers::Locator::Progress() +void Technology_BasicLayers::Locator::progress() // ********************************************* { do { - _basicLayerLocator.Progress(); + _basicLayerLocator.progress(); } - while (_basicLayerLocator.IsValid() && !(_basicLayerLocator.getElement()->getMask() & _mask)); + while (_basicLayerLocator.isValid() && !(_basicLayerLocator.getElement()->getMask() & _mask)); } string Technology_BasicLayers::Locator::_getString() const diff --git a/hurricane/src/hurricane/UserGo.cpp b/hurricane/src/hurricane/UserGo.cpp index 5cc45bfb..13445a5c 100644 --- a/hurricane/src/hurricane/UserGo.cpp +++ b/hurricane/src/hurricane/UserGo.cpp @@ -44,9 +44,9 @@ class UserGo_CellUserGos : public Collection { public: virtual UserGo* getElement() const; public: virtual Hurricane::Locator* getClone() const; - public: virtual bool IsValid() const; + public: virtual bool isValid() const; - public: virtual void Progress(); + public: virtual void progress(); public: virtual string _getString() const; @@ -220,7 +220,7 @@ UserGo_CellUserGos::Locator::Locator(const Cell* cell) { if (_cell) { _displaySlotLocator = getDisplaySlots(cell).getLocator(); - if (_displaySlotLocator.IsValid()) + if (_displaySlotLocator.isValid()) { DisplaySlot* displaySlot = _displaySlotLocator.getElement(); _userGoLocator = displaySlot->getUserGos().getLocator(); @@ -258,21 +258,21 @@ Locator* UserGo_CellUserGos::Locator::getClone() const return new Locator(*this); } -bool UserGo_CellUserGos::Locator::IsValid() const +bool UserGo_CellUserGos::Locator::isValid() const // *************************************** { - return _userGoLocator.IsValid(); + return _userGoLocator.isValid(); } -void UserGo_CellUserGos::Locator::Progress() +void UserGo_CellUserGos::Locator::progress() // ***************************************** { - if (_userGoLocator.IsValid()) { - _userGoLocator.Progress(); + if (_userGoLocator.isValid()) { + _userGoLocator.progress(); } - else if (_displaySlotLocator.IsValid()) { - _displaySlotLocator.Progress(); - if (_displaySlotLocator.IsValid()) + else if (_displaySlotLocator.isValid()) { + _displaySlotLocator.progress(); + if (_displaySlotLocator.isValid()) { DisplaySlot* displaySlot = _displaySlotLocator.getElement(); _userGoLocator = displaySlot->getUserGos().getLocator(); diff --git a/hurricane/src/hurricane/UserGos.h b/hurricane/src/hurricane/UserGos.h index 99450836..3e3a40dd 100644 --- a/hurricane/src/hurricane/UserGos.h +++ b/hurricane/src/hurricane/UserGos.h @@ -51,9 +51,9 @@ typedef GenericFilter UserGoFilter; /***************************************/\ {\ UserGoLocator _locator = userGos.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ UserGo* userGo = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); } // End of Hurricane namespace. diff --git a/hurricane/src/hurricane/VectorCollection.h b/hurricane/src/hurricane/VectorCollection.h index f614c5d5..3d3ff35d 100644 --- a/hurricane/src/hurricane/VectorCollection.h +++ b/hurricane/src/hurricane/VectorCollection.h @@ -47,7 +47,7 @@ template class VectorCollection : public Collection { public: virtual Element getElement() const // *************************************** { - return (IsValid()) ? *_iterator : Element(); + return (isValid()) ? *_iterator : Element(); }; public: virtual Hurricane::Locator* getClone() const @@ -56,13 +56,13 @@ template class VectorCollection : public Collection { return new Locator(_elementVector); }; - public: virtual bool IsValid() const + public: virtual bool isValid() const // ********************************* { return (_elementVector && (_iterator != _elementVector->end())); }; - public: virtual void Progress() + public: virtual void progress() // **************************** { ++_iterator; diff --git a/hurricane/src/hurricane/Verticals.h b/hurricane/src/hurricane/Verticals.h index 8d7f914b..a166fc06 100644 --- a/hurricane/src/hurricane/Verticals.h +++ b/hurricane/src/hurricane/Verticals.h @@ -47,9 +47,9 @@ typedef GenericFilter VerticalFilter; /*********************************************/\ {\ VerticalLocator _locator = verticals.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ Vertical* vertical = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/hurricane/Views.h b/hurricane/src/hurricane/Views.h index 02c550ff..9c2568ea 100644 --- a/hurricane/src/hurricane/Views.h +++ b/hurricane/src/hurricane/Views.h @@ -47,9 +47,9 @@ typedef GenericFilter ViewFilter; /*********************************/\ {\ ViewLocator _locator = views.getLocator();\ - while (_locator.IsValid()) {\ + while (_locator.isValid()) {\ View* view = _locator.getElement();\ - _locator.Progress(); + _locator.progress(); diff --git a/hurricane/src/pyext/PyCellLocator.cpp b/hurricane/src/pyext/PyCellLocator.cpp index 3cd5a233..2a456dd9 100644 --- a/hurricane/src/pyext/PyCellLocator.cpp +++ b/hurricane/src/pyext/PyCellLocator.cpp @@ -83,7 +83,7 @@ extern "C" { // Standart Predicates (Attributes). - DirectGetBoolAttribute(PyCellLocator_IsValid,IsValid,PyCellLocator,Locator) + DirectGetBoolAttribute(PyCellLocator_isValid,isValid,PyCellLocator,Locator) // Standart Locator Accessors (Attributes). @@ -101,8 +101,8 @@ extern "C" { // PyCellLocator Attribute Method table. PyMethodDef PyCellLocator_Methods[] = - { { "IsValid" , (PyCFunction)PyCellLocator_IsValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } - , { "Progress" , (PyCFunction)PyCellLocator_Progress , METH_NOARGS , "Moves forward the locator to the following element." } + { { "isValid" , (PyCFunction)PyCellLocator_isValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } + , { "progress" , (PyCFunction)PyCellLocator_progress , METH_NOARGS , "Moves forward the locator to the following element." } , { "getElement" , (PyCFunction)PyCellLocator_getElement , METH_NOARGS , "Returns the current element (or the value Type() when the locator is not or no longer valid)." } , { "getClone" , (PyCFunction)PyCellLocator_getClone , METH_NOARGS , "This function allocates and returns a new locator that will have the same visiting course than the remaining one of the locator being cloned." } , { "destroy" , (PyCFunction)PyCellLocator_destroy , METH_NOARGS diff --git a/hurricane/src/pyext/PyComponentLocator.cpp b/hurricane/src/pyext/PyComponentLocator.cpp index bf4fe8a3..2460dcf9 100644 --- a/hurricane/src/pyext/PyComponentLocator.cpp +++ b/hurricane/src/pyext/PyComponentLocator.cpp @@ -81,7 +81,7 @@ extern "C" { // Standart Accessors (Attributes). // Standart Predicates (Attributes). - DirectGetBoolAttribute(PyComponentLocator_IsValid,IsValid,PyComponentLocator,Locator) + DirectGetBoolAttribute(PyComponentLocator_isValid,isValid,PyComponentLocator,Locator) // Standart Locator Accessors (Attributes). @@ -99,8 +99,8 @@ extern "C" { // PyComponent Attribute Method table. PyMethodDef PyComponentLocator_Methods[] = - { { "IsValid" , (PyCFunction)PyComponentLocator_IsValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } - , { "Progress" , (PyCFunction)PyComponentLocator_Progress , METH_NOARGS , "Moves forward the locator to the following element." } + { { "isValid" , (PyCFunction)PyComponentLocator_isValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } + , { "progress" , (PyCFunction)PyComponentLocator_progress , METH_NOARGS , "Moves forward the locator to the following element." } , { "getElement" , (PyCFunction)PyComponentLocator_getElement , METH_NOARGS , "Returns the current element (or the value Type() when the locator is not or no longer valid)." } , { "getClone" , (PyCFunction)PyComponentLocator_getClone , METH_NOARGS , "This function allocates and returns a new locator that will have the same visiting course than the remaining one of the locator being cloned." } , { "destroy" , (PyCFunction)PyComponentLocator_destroy , METH_NOARGS @@ -117,7 +117,7 @@ extern "C" { LocatorPyTypeObjectLinkPyType(Component, Component*) -# else // End of Python Module Code Part. +#else // End of Python Module Code Part. // x=================================================================x diff --git a/hurricane/src/pyext/PyHurricane.h b/hurricane/src/pyext/PyHurricane.h index 8e79eb33..538c801c 100644 --- a/hurricane/src/pyext/PyHurricane.h +++ b/hurricane/src/pyext/PyHurricane.h @@ -390,13 +390,13 @@ extern "C" { // Locator Attribute Method For Progress. # define LocatorProgressAttribute(SELF_TYPE) \ - static PyObject* Py##SELF_TYPE##Locator_Progress ( Py##SELF_TYPE##Locator *self ) \ + static PyObject* Py##SELF_TYPE##Locator_progress ( Py##SELF_TYPE##Locator *self ) \ { \ - trace << #SELF_TYPE "Locator.Progress()" << endl; \ - METHOD_HEAD ( #SELF_TYPE "Locator.Progress()" ) \ + trace << #SELF_TYPE "Locator.progress()" << endl; \ + METHOD_HEAD ( #SELF_TYPE "Locator.progress()" ) \ \ HTRY \ - locator->Progress (); \ + locator->progress (); \ HCATCH \ \ Py_RETURN_NONE; \ diff --git a/hurricane/src/pyext/PyHyperNet.cpp b/hurricane/src/pyext/PyHyperNet.cpp index a47ae143..33ddc006 100644 --- a/hurricane/src/pyext/PyHyperNet.cpp +++ b/hurricane/src/pyext/PyHyperNet.cpp @@ -87,7 +87,7 @@ extern "C" { // Standart Predicates (Attributes). - DirectGetBoolAttribute(PyHyperNet_IsValid ,IsValid ,PyHyperNet,HyperNet) + DirectGetBoolAttribute(PyHyperNet_isValid ,isValid ,PyHyperNet,HyperNet) // Standart Delete (Attribute). @@ -150,7 +150,7 @@ extern "C" { PyMethodDef PyHyperNet_Methods[] = { { "getCell" , (PyCFunction)PyHyperNet_getCell , METH_NOARGS , "Returns the hyperNet cell." } - , { "IsValid" , (PyCFunction)PyHyperNet_IsValid , METH_NOARGS , "Returns trus if the HyperNet isValid." } + , { "isValid" , (PyCFunction)PyHyperNet_isValid , METH_NOARGS , "Returns trus if the HyperNet isValid." } , { "getLeafPlugOccurrenceLocator", (PyCFunction)PyHyperNet_getLeafPlugOccurrenceLocator, METH_NOARGS , "Returns the collection of leaf occurrences" } , { "destroy" , (PyCFunction)PyHyperNet_destroy , METH_NOARGS diff --git a/hurricane/src/pyext/PyInstanceLocator.cpp b/hurricane/src/pyext/PyInstanceLocator.cpp index d7981fb2..76205abc 100644 --- a/hurricane/src/pyext/PyInstanceLocator.cpp +++ b/hurricane/src/pyext/PyInstanceLocator.cpp @@ -84,7 +84,7 @@ extern "C" { // Standart Predicates (Attributes). - DirectGetBoolAttribute(PyInstanceLocator_IsValid,IsValid,PyInstanceLocator,Locator) + DirectGetBoolAttribute(PyInstanceLocator_isValid,isValid,PyInstanceLocator,Locator) // Standart Locator Accessors (Attributes). @@ -103,8 +103,8 @@ extern "C" { // PyInstanceLocator Attribute Method table. PyMethodDef PyInstanceLocator_Methods[] = - { { "IsValid" , (PyCFunction)PyInstanceLocator_IsValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } - , { "Progress" , (PyCFunction)PyInstanceLocator_Progress , METH_NOARGS , "Moves forward the locator to the following element." } + { { "isValid" , (PyCFunction)PyInstanceLocator_isValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } + , { "progress" , (PyCFunction)PyInstanceLocator_progress , METH_NOARGS , "Moves forward the locator to the following element." } , { "getElement" , (PyCFunction)PyInstanceLocator_getElement , METH_NOARGS , "Returns the current element (or the value Type() when the locator is not or no longer valid)." } , { "getClone" , (PyCFunction)PyInstanceLocator_getClone , METH_NOARGS , "This function allocates and returns a new locator that will have the same visiting course than the remaining one of the locator being cloned." } , { "destroy" , (PyCFunction)PyInstanceLocator_destroy , METH_NOARGS diff --git a/hurricane/src/pyext/PyNetLocator.cpp b/hurricane/src/pyext/PyNetLocator.cpp index ce56b156..488a8c60 100644 --- a/hurricane/src/pyext/PyNetLocator.cpp +++ b/hurricane/src/pyext/PyNetLocator.cpp @@ -79,7 +79,7 @@ extern "C" { // Standart Predicates (Attributes). - DirectGetBoolAttribute(PyNetLocator_IsValid,IsValid,PyNetLocator,Locator) + DirectGetBoolAttribute(PyNetLocator_isValid,isValid,PyNetLocator,Locator) // Standart Locator Accessors (Attributes). @@ -97,8 +97,8 @@ extern "C" { // PyNetLocator Attribute Method table. PyMethodDef PyNetLocator_Methods[] = - { { "IsValid" , (PyCFunction)PyNetLocator_IsValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } - , { "Progress" , (PyCFunction)PyNetLocator_Progress , METH_NOARGS , "Moves forward the locator to the following element." } + { { "isValid" , (PyCFunction)PyNetLocator_isValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } + , { "progress" , (PyCFunction)PyNetLocator_progress , METH_NOARGS , "Moves forward the locator to the following element." } , { "getElement" , (PyCFunction)PyNetLocator_getElement , METH_NOARGS , "Returns the current element (or the value Type() when the locator is not or no longer valid)." } , { "getClone" , (PyCFunction)PyNetLocator_getClone , METH_NOARGS , "This function allocates and returns a new locator that will have the same visiting course than the remaining one of the locator being cloned." } , { "destroy" , (PyCFunction)PyNetLocator_destroy , METH_NOARGS diff --git a/hurricane/src/pyext/PyOccurrence.cpp b/hurricane/src/pyext/PyOccurrence.cpp index ed281b3d..f6789eef 100644 --- a/hurricane/src/pyext/PyOccurrence.cpp +++ b/hurricane/src/pyext/PyOccurrence.cpp @@ -86,7 +86,7 @@ extern "C" { // Standart Predicates (Attributes). - DirectGetBoolAttribute(PyOccurrence_IsValid ,IsValid ,PyOccurrence,Occurrence) + DirectGetBoolAttribute(PyOccurrence_isValid ,isValid ,PyOccurrence,Occurrence) DirectGetBoolAttribute(PyOccurrence_HasProperty,HasProperty,PyOccurrence,Occurrence) @@ -227,7 +227,7 @@ extern "C" { , { "getOwnerCell" , (PyCFunction)PyOccurrence_getOwnerCell , METH_NOARGS, "Returns the occurrence owner cell." } , { "getMasterCell" , (PyCFunction)PyOccurrence_getMasterCell , METH_NOARGS, "Returns the cell owning the referenced entity." } , { "getBoundingBox", (PyCFunction)PyOccurrence_getBoundingBox, METH_NOARGS, "Returns the occurrence bounding box." } - , { "IsValid" , (PyCFunction)PyOccurrence_IsValid , METH_NOARGS, "Returns true if the occurrence is valid." } + , { "isValid" , (PyCFunction)PyOccurrence_isValid , METH_NOARGS, "Returns true if the occurrence is valid." } , { "HasProperty" , (PyCFunction)PyOccurrence_HasProperty , METH_NOARGS, "Returns true if the occurrence owns some properties." } , { "destroy" , (PyCFunction)PyOccurrence_destroy , METH_NOARGS , "Destroy associated hurricane object, the python object remains." } diff --git a/hurricane/src/pyext/PyOccurrenceLocator.cpp b/hurricane/src/pyext/PyOccurrenceLocator.cpp index 34910df0..23869bfe 100644 --- a/hurricane/src/pyext/PyOccurrenceLocator.cpp +++ b/hurricane/src/pyext/PyOccurrenceLocator.cpp @@ -79,22 +79,22 @@ extern "C" { // Standart Predicates (Attributes). - DirectGetBoolAttribute(PyOccurrenceLocator_IsValid,IsValid,PyOccurrenceLocator,Locator) + DirectGetBoolAttribute(PyOccurrenceLocator_isValid,isValid,PyOccurrenceLocator,Locator) // Standart destroy (Attribute). DirectDestroyAttribute(PyOccurrenceLocator_destroy, PyOccurrenceLocator) // --------------------------------------------------------------- - // Attribute Method : "PyOccurrenceLocator_Progress ()" + // Attribute Method : "PyOccurrenceLocator_progress ()" - static PyObject* PyOccurrenceLocator_Progress ( PyOccurrenceLocator *self ) { - trace << "OccurrenceLocator.Progress()" << endl; + static PyObject* PyOccurrenceLocator_progress ( PyOccurrenceLocator *self ) { + trace << "OccurrenceLocator.progress()" << endl; HTRY - METHOD_HEAD ( "OccurrenceLocator.Progress()" ) + METHOD_HEAD ( "OccurrenceLocator.progress()" ) - locator->Progress (); + locator->progress (); HCATCH Py_RETURN_NONE; @@ -150,8 +150,8 @@ extern "C" { // PyOccurrenceLocator Attribute Method table. PyMethodDef PyOccurrenceLocator_Methods[] = - { { "IsValid" , (PyCFunction)PyOccurrenceLocator_IsValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } - , { "Progress" , (PyCFunction)PyOccurrenceLocator_Progress , METH_NOARGS , "Moves forward the locator to the following element." } + { { "isValid" , (PyCFunction)PyOccurrenceLocator_isValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } + , { "progress" , (PyCFunction)PyOccurrenceLocator_progress , METH_NOARGS , "Moves forward the locator to the following element." } , { "getElement" , (PyCFunction)PyOccurrenceLocator_getElement , METH_NOARGS , "Returns the current element (or the value Type() when the locator is not or no longer valid)." } , { "getClone" , (PyCFunction)PyOccurrenceLocator_getClone , METH_NOARGS , "This function allocates and returns a new locator that will have the same visiting course than the remaining one of the locator being cloned." } , { "destroy" , (PyCFunction)PyOccurrenceLocator_destroy , METH_NOARGS @@ -168,7 +168,7 @@ extern "C" { LocatorPyTypeObjectLinkPyType(Occurrence, Occurrence) -# else // End of Python Module Code Part. +#else // End of Python Module Code Part. // x=================================================================x diff --git a/hurricane/src/pyext/PyPinLocator.cpp b/hurricane/src/pyext/PyPinLocator.cpp index e11c0105..27e7abc3 100644 --- a/hurricane/src/pyext/PyPinLocator.cpp +++ b/hurricane/src/pyext/PyPinLocator.cpp @@ -85,7 +85,7 @@ extern "C" { // Standart Predicates (Attributes). - DirectGetBoolAttribute(PyPinLocator_IsValid,IsValid,PyPinLocator,Locator) + DirectGetBoolAttribute(PyPinLocator_isValid,isValid,PyPinLocator,Locator) // Standart Locator Accessors (Attributes). @@ -104,8 +104,8 @@ extern "C" { // PyPinLocator Attribute Method table. PyMethodDef PyPinLocator_Methods[] = - { { "IsValid" , (PyCFunction)PyPinLocator_IsValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } - , { "Progress" , (PyCFunction)PyPinLocator_Progress , METH_NOARGS , "Moves forward the locator to the following element." } + { { "isValid" , (PyCFunction)PyPinLocator_isValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } + , { "progress" , (PyCFunction)PyPinLocator_progress , METH_NOARGS , "Moves forward the locator to the following element." } , { "getElement" , (PyCFunction)PyPinLocator_getElement , METH_NOARGS , "Returns the current element (or the value Type() when the locator is not or no longer valid)." } , { "getClone" , (PyCFunction)PyPinLocator_getClone , METH_NOARGS , "This function allocates and returns a new locator that will have the same visiting course than the remaining one of the locator being cloned." } , { "destroy" , (PyCFunction)PyPinLocator_destroy , METH_NOARGS diff --git a/hurricane/src/pyext/PyPlugLocator.cpp b/hurricane/src/pyext/PyPlugLocator.cpp index 79c7e40c..38361459 100644 --- a/hurricane/src/pyext/PyPlugLocator.cpp +++ b/hurricane/src/pyext/PyPlugLocator.cpp @@ -86,7 +86,7 @@ extern "C" { // Standart Predicates (Attributes). - DirectGetBoolAttribute(PyPlugLocator_IsValid,IsValid,PyPlugLocator,Locator) + DirectGetBoolAttribute(PyPlugLocator_isValid,isValid,PyPlugLocator,Locator) // Standart Locator Accessors (Attributes). @@ -101,8 +101,8 @@ extern "C" { // PyPlugLocator Attribute Method table. PyMethodDef PyPlugLocator_Methods[] = - { { "IsValid" , (PyCFunction)PyPlugLocator_IsValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } - , { "Progress" , (PyCFunction)PyPlugLocator_Progress , METH_NOARGS , "Moves forward the locator to the following element." } + { { "isValid" , (PyCFunction)PyPlugLocator_isValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } + , { "progress" , (PyCFunction)PyPlugLocator_progress , METH_NOARGS , "Moves forward the locator to the following element." } , { "getElement" , (PyCFunction)PyPlugLocator_getElement , METH_NOARGS , "Returns the current element (or the value Type() when the locator is not or no longer valid)." } , { "getClone" , (PyCFunction)PyPlugLocator_getClone , METH_NOARGS , "This function allocates and returns a new locator that will have the same visiting course than the remaining one of the locator being cloned." } , {NULL, NULL, 0, NULL} /* sentinel */ diff --git a/hurricane/src/pyext/PyReferenceLocator.cpp b/hurricane/src/pyext/PyReferenceLocator.cpp index a5216be4..42a3f77d 100644 --- a/hurricane/src/pyext/PyReferenceLocator.cpp +++ b/hurricane/src/pyext/PyReferenceLocator.cpp @@ -82,7 +82,7 @@ extern "C" { // Standart Predicates (Attributes). - DirectGetBoolAttribute(PyReferenceLocator_IsValid,IsValid,PyReferenceLocator,Locator) + DirectGetBoolAttribute(PyReferenceLocator_isValid,isValid,PyReferenceLocator,Locator) // Standart Locator Accessors (Attributes). @@ -101,8 +101,8 @@ extern "C" { // PyReferenceLocator Attribute Method table. PyMethodDef PyReferenceLocator_Methods[] = - { { "IsValid" , (PyCFunction)PyReferenceLocator_IsValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } - , { "Progress" , (PyCFunction)PyReferenceLocator_Progress , METH_NOARGS , "Moves forward the locator to the following element." } + { { "isValid" , (PyCFunction)PyReferenceLocator_isValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } + , { "progress" , (PyCFunction)PyReferenceLocator_progress , METH_NOARGS , "Moves forward the locator to the following element." } , { "getElement" , (PyCFunction)PyReferenceLocator_getElement , METH_NOARGS , "Returns the current element (or the value Type() when the locator is not or no longer valid)." } , { "getClone" , (PyCFunction)PyReferenceLocator_getClone , METH_NOARGS , "This function allocates and returns a new locator that will have the same visiting course than the remaining one of the locator being cloned." } , { "destroy" , (PyCFunction)PyReferenceLocator_destroy , METH_NOARGS @@ -120,7 +120,7 @@ extern "C" { LocatorPyTypeObjectLinkPyType(Reference, Reference*) -# else // End of Python Module Code Part. +#else // End of Python Module Code Part. // x=================================================================x diff --git a/hurricane/src/pyext/PySegmentLocator.cpp b/hurricane/src/pyext/PySegmentLocator.cpp index 66d77fb2..298a81bc 100644 --- a/hurricane/src/pyext/PySegmentLocator.cpp +++ b/hurricane/src/pyext/PySegmentLocator.cpp @@ -84,7 +84,7 @@ extern "C" { // Standart Predicates (Attributes). - DirectGetBoolAttribute(PySegmentLocator_IsValid,IsValid,PySegmentLocator,Locator) + DirectGetBoolAttribute(PySegmentLocator_isValid,isValid,PySegmentLocator,Locator) // Standart Locator Accessors (Attributes). @@ -103,8 +103,8 @@ extern "C" { // PySegmentLocator Attribute Method table. PyMethodDef PySegmentLocator_Methods[] = - { { "IsValid" , (PyCFunction)PySegmentLocator_IsValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } - , { "Progress" , (PyCFunction)PySegmentLocator_Progress , METH_NOARGS , "Moves forward the locator to the following element." } + { { "isValid" , (PyCFunction)PySegmentLocator_isValid , METH_NOARGS , "Returns true while the walk has not exhausted the set of elements, else false." } + , { "progress" , (PyCFunction)PySegmentLocator_progress , METH_NOARGS , "Moves forward the locator to the following element." } , { "getElement" , (PyCFunction)PySegmentLocator_getElement , METH_NOARGS , "Returns the current element (or the value Type() when the locator is not or no longer valid)." } , { "getClone" , (PyCFunction)PySegmentLocator_getClone , METH_NOARGS , "This function allocates and returns a new locator that will have the same visiting course than the remaining one of the locator being cloned." } , { "destroy" , (PyCFunction)PySegmentLocator_destroy , METH_NOARGS