luke
/
OpenSTA
mirror of https://github.com/The-OpenROAD-Project/OpenSTA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

override 

Signed-off-by: James Cherry <cherry@parallaxsw.com>
This commit is contained in:
James Cherry 2026-03-08 14:07:40 -07:00
parent c2c40f76b1
commit 48511e09b1
11 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
include/sta/Bfs.hh
View File

@ -77,9 +77,9 @@ public:
void remove(Vertex *vertex); void remove(Vertex *vertex);
void reportEntries() const; void reportEntries() const;
virtual bool hasNext(); bool hasNext() override;
bool hasNext(Level to_level); bool hasNext(Level to_level);
virtual Vertex *next(); Vertex *next() override;
// Apply visitor to all vertices in the queue in level order. // Apply visitor to all vertices in the queue in level order.
// Returns the number of vertices that are visited. // Returns the number of vertices that are visited.
@ -131,19 +131,19 @@ public:
SearchPred *search_pred, SearchPred *search_pred,
StaState *sta); StaState *sta);
virtual ~BfsFwdIterator(); virtual ~BfsFwdIterator();
virtual void enqueueAdjacentVertices(Vertex *vertex, void enqueueAdjacentVertices(Vertex *vertex,
SearchPred *search_pred); SearchPred *search_pred) override;
virtual void enqueueAdjacentVertices(Vertex *vertex, void enqueueAdjacentVertices(Vertex *vertex,
SearchPred *search_pred, SearchPred *search_pred,
const Mode *mode); const Mode *mode) override;
using BfsIterator::enqueueAdjacentVertices; using BfsIterator::enqueueAdjacentVertices;
protected: protected:
virtual bool levelLessOrEqual(Level level1, bool levelLessOrEqual(Level level1,
Level level2) const; Level level2) const override;
virtual bool levelLess(Level level1, bool levelLess(Level level1,
Level level2) const; Level level2) const override;
virtual void incrLevel(Level &level) const; void incrLevel(Level &level) const override;
}; };
class BfsBkwdIterator : public BfsIterator class BfsBkwdIterator : public BfsIterator
@ -153,19 +153,19 @@ public:
SearchPred *search_pred, SearchPred *search_pred,
StaState *sta); StaState *sta);
virtual ~BfsBkwdIterator(); virtual ~BfsBkwdIterator();
virtual void enqueueAdjacentVertices(Vertex *vertex, void enqueueAdjacentVertices(Vertex *vertex,
SearchPred *search_pred); SearchPred *search_pred) override;
virtual void enqueueAdjacentVertices(Vertex *vertex, void enqueueAdjacentVertices(Vertex *vertex,
SearchPred *search_pred, SearchPred *search_pred,
const Mode *mode); const Mode *mode) override;
using BfsIterator::enqueueAdjacentVertices; using BfsIterator::enqueueAdjacentVertices;
protected: protected:
virtual bool levelLessOrEqual(Level level1, bool levelLessOrEqual(Level level1,
Level level2) const; Level level2) const override;
virtual bool levelLess(Level level1, bool levelLess(Level level1,
Level level2) const; Level level2) const override;
virtual void incrLevel(Level &level) const; void incrLevel(Level &level) const override;
}; };
} // namespace } // namespace

4
include/sta/ConcreteLibrary.hh
View File

@ -264,8 +264,8 @@ class ConcreteCellPortBitIterator : public Iterator<ConcretePort*>
{ {
public: public:
ConcreteCellPortBitIterator(const ConcreteCell *cell); ConcreteCellPortBitIterator(const ConcreteCell *cell);
virtual bool hasNext(); bool hasNext() override;
virtual ConcretePort *next(); ConcretePort *next() override;
private: private:
void findNext(); void findNext();

16
include/sta/Graph.hh
View File

@ -427,8 +427,8 @@ class VertexIterator : public Iterator<Vertex*>
{ {
public: public:
VertexIterator(Graph *graph); VertexIterator(Graph *graph);
virtual bool hasNext() { return vertex_ || bidir_vertex_; } bool hasNext() override { return vertex_ || bidir_vertex_; }
virtual Vertex *next(); Vertex *next() override;
private: private:
bool findNextPin(); bool findNextPin();
@ -450,8 +450,8 @@ public:
const Graph *graph); const Graph *graph);
VertexInEdgeIterator(VertexId vertex_id, VertexInEdgeIterator(VertexId vertex_id,
const Graph *graph); const Graph *graph);
bool hasNext() { return (next_ != nullptr); } bool hasNext() override { return (next_ != nullptr); }
Edge *next(); Edge *next() override;
private: private:
Edge *next_; Edge *next_;
@ -463,8 +463,8 @@ class VertexOutEdgeIterator : public VertexEdgeIterator
public: public:
VertexOutEdgeIterator(Vertex *vertex, VertexOutEdgeIterator(Vertex *vertex,
const Graph *graph); const Graph *graph);
bool hasNext() { return (next_ != nullptr); } bool hasNext() override { return (next_ != nullptr); }
Edge *next(); Edge *next() override;
private: private:
Edge *next_; Edge *next_;
@ -478,8 +478,8 @@ public:
EdgesThruHierPinIterator(const Pin *hpin, EdgesThruHierPinIterator(const Pin *hpin,
Network *network, Network *network,
Graph *graph); Graph *graph);
virtual bool hasNext(); bool hasNext() override;
virtual Edge *next(); Edge *next() override;
private: private:
EdgeSet edges_; EdgeSet edges_;

12
include/sta/Iterator.hh
View File

@ -56,8 +56,8 @@ public:
{ {
} }
bool hasNext() { return seq_ && itr_ != seq_->end(); } bool hasNext() override { return seq_ && itr_ != seq_->end(); }
OBJ_TYPE next() { return *itr_++; } OBJ_TYPE next() override { return *itr_++; }
protected: protected:
const VECTOR_TYPE *seq_; const VECTOR_TYPE *seq_;
@ -80,8 +80,8 @@ public:
{ {
} }
bool hasNext() { return map_ && itr_ != map_->end(); } bool hasNext() override { return map_ && itr_ != map_->end(); }
OBJ_TYPE next() { OBJ_TYPE next() override {
OBJ_TYPE next = itr_->second; OBJ_TYPE next = itr_->second;
itr_++; itr_++;
return next; return next;
@ -108,8 +108,8 @@ public:
{ {
} }
bool hasNext() { return set_ && itr_ != set_->end(); } bool hasNext() override { return set_ && itr_ != set_->end(); }
OBJ_TYPE next() { return *itr_++; } OBJ_TYPE next() override { return *itr_++; }
protected: protected:
const SET_TYPE *set_; const SET_TYPE *set_;

16
include/sta/Liberty.hh
View File

@ -458,8 +458,8 @@ class LibertyCellIterator : public Iterator<LibertyCell*>
{ {
public: public:
LibertyCellIterator(const LibertyLibrary *library); LibertyCellIterator(const LibertyLibrary *library);
bool hasNext(); bool hasNext() override;
LibertyCell *next(); LibertyCell *next() override;
private: private:
ConcreteLibraryCellIterator iter_; ConcreteLibraryCellIterator iter_;
@ -715,8 +715,8 @@ class LibertyCellPortIterator : public Iterator<LibertyPort*>
{ {
public: public:
LibertyCellPortIterator(const LibertyCell *cell); LibertyCellPortIterator(const LibertyCell *cell);
bool hasNext(); bool hasNext() override;
LibertyPort *next(); LibertyPort *next() override;
private: private:
ConcreteCellPortIterator iter_; ConcreteCellPortIterator iter_;
@ -727,8 +727,8 @@ class LibertyCellPortBitIterator : public Iterator<LibertyPort*>
public: public:
LibertyCellPortBitIterator(const LibertyCell *cell); LibertyCellPortBitIterator(const LibertyCell *cell);
virtual ~LibertyCellPortBitIterator(); virtual ~LibertyCellPortBitIterator();
bool hasNext(); bool hasNext() override;
LibertyPort *next(); LibertyPort *next() override;
private: private:
ConcreteCellPortBitIterator *iter_; ConcreteCellPortBitIterator *iter_;
@ -980,8 +980,8 @@ class LibertyPortMemberIterator : public Iterator<LibertyPort*>
public: public:
LibertyPortMemberIterator(const LibertyPort *port); LibertyPortMemberIterator(const LibertyPort *port);
virtual ~LibertyPortMemberIterator(); virtual ~LibertyPortMemberIterator();
virtual bool hasNext(); bool hasNext() override;
virtual LibertyPort *next(); LibertyPort *next() override;
private: private:
ConcretePortMemberIterator *iter_; ConcretePortMemberIterator *iter_;

4
include/sta/Path.hh
View File

@ -204,8 +204,8 @@ public:
const MinMax *min_max, const MinMax *min_max,
const StaState *sta); const StaState *sta);
virtual ~VertexPathIterator(); virtual ~VertexPathIterator();
virtual bool hasNext(); bool hasNext() override;
virtual Path *next(); Path *next() override;
private: private:
void findNext(); void findNext();

4
liberty/LibertyReaderPvt.hh
View File

@ -517,8 +517,8 @@ public:
LibertyReader *visitor, LibertyReader *visitor,
int line); int line);
~PortNameBitIterator(); ~PortNameBitIterator();
virtual bool hasNext(); bool hasNext() override;
virtual LibertyPort *next(); LibertyPort *next() override;
unsigned size() const { return size_; } unsigned size() const { return size_; }
protected: protected:

40
network/ConcreteNetwork.cc
View File

@ -62,8 +62,8 @@ class ConcreteInstanceChildIterator : public InstanceChildIterator
{ {
public: public:
ConcreteInstanceChildIterator(ConcreteInstanceChildMap *map); ConcreteInstanceChildIterator(ConcreteInstanceChildMap *map);
bool hasNext(); bool hasNext() override;
Instance *next(); Instance *next() override;
private: private:
ConcreteInstanceChildMap *map_; ConcreteInstanceChildMap *map_;
@ -96,8 +96,8 @@ class ConcreteInstanceNetIterator : public InstanceNetIterator
{ {
public: public:
ConcreteInstanceNetIterator(ConcreteInstanceNetMap *nets); ConcreteInstanceNetIterator(ConcreteInstanceNetMap *nets);
bool hasNext(); bool hasNext() override;
Net *next(); Net *next() override;
private: private:
void findNext(); void findNext();
@ -152,8 +152,8 @@ class ConcreteInstancePinIterator : public InstancePinIterator
public: public:
ConcreteInstancePinIterator(const ConcreteInstance *inst, ConcreteInstancePinIterator(const ConcreteInstance *inst,
int pin_count); int pin_count);
bool hasNext(); bool hasNext() override;
Pin *next(); Pin *next() override;
private: private:
void findNext(); void findNext();
@ -206,8 +206,8 @@ class ConcreteNetPinIterator : public NetPinIterator
{ {
public: public:
ConcreteNetPinIterator(const ConcreteNet *net); ConcreteNetPinIterator(const ConcreteNet *net);
bool hasNext(); bool hasNext() override;
Pin *next(); Pin *next() override;
private: private:
ConcretePin *next_; ConcretePin *next_;
@ -238,8 +238,8 @@ class ConcreteNetTermIterator : public NetTermIterator
{ {
public: public:
ConcreteNetTermIterator(const ConcreteNet *net); ConcreteNetTermIterator(const ConcreteNet *net);
bool hasNext(); bool hasNext() override;
Term *next(); Term *next() override;
private: private:
ConcreteTerm *next_; ConcreteTerm *next_;
@ -322,8 +322,8 @@ class ConcreteLibraryIterator1 : public Iterator<Library*>
{ {
public: public:
ConcreteLibraryIterator1(const ConcreteLibrarySeq &libs); ConcreteLibraryIterator1(const ConcreteLibrarySeq &libs);
virtual bool hasNext(); bool hasNext() override;
virtual Library *next(); Library *next() override;
private: private:
const ConcreteLibrarySeq &libs_; const ConcreteLibrarySeq &libs_;
@ -361,8 +361,8 @@ class ConcreteLibertyLibraryIterator : public Iterator<LibertyLibrary*>
public: public:
ConcreteLibertyLibraryIterator(const ConcreteNetwork *network); ConcreteLibertyLibraryIterator(const ConcreteNetwork *network);
virtual ~ConcreteLibertyLibraryIterator(); virtual ~ConcreteLibertyLibraryIterator();
virtual bool hasNext(); bool hasNext() override;
virtual LibertyLibrary *next(); LibertyLibrary *next() override;
private: private:
void findNext(); void findNext();
@ -719,8 +719,8 @@ class ConcreteCellPortIterator1 : public CellPortIterator
public: public:
ConcreteCellPortIterator1(const ConcreteCell *cell); ConcreteCellPortIterator1(const ConcreteCell *cell);
~ConcreteCellPortIterator1(); ~ConcreteCellPortIterator1();
virtual bool hasNext() { return iter_->hasNext(); } bool hasNext() override { return iter_->hasNext(); }
virtual Port *next(); Port *next() override;
private: private:
ConcreteCellPortIterator *iter_; ConcreteCellPortIterator *iter_;
@ -756,8 +756,8 @@ class ConcreteCellPortBitIterator1 : public CellPortIterator
public: public:
ConcreteCellPortBitIterator1(const ConcreteCell *cell); ConcreteCellPortBitIterator1(const ConcreteCell *cell);
~ConcreteCellPortBitIterator1(); ~ConcreteCellPortBitIterator1();
virtual bool hasNext() { return iter_->hasNext(); } bool hasNext() override { return iter_->hasNext(); }
virtual Port *next(); Port *next() override;
private: private:
ConcreteCellPortBitIterator *iter_; ConcreteCellPortBitIterator *iter_;
@ -903,8 +903,8 @@ class ConcretePortMemberIterator1 : public PortMemberIterator
public: public:
ConcretePortMemberIterator1(const ConcretePort *port); ConcretePortMemberIterator1(const ConcretePort *port);
~ConcretePortMemberIterator1(); ~ConcretePortMemberIterator1();
virtual bool hasNext(); bool hasNext() override;
virtual Port *next(); Port *next() override;
private: private:
ConcretePortMemberIterator *iter_; ConcretePortMemberIterator *iter_;

8
network/Network.cc
View File

@ -1221,8 +1221,8 @@ class LeafInstanceIterator1 : public LeafInstanceIterator
public: public:
LeafInstanceIterator1(const Instance *inst, LeafInstanceIterator1(const Instance *inst,
const Network *network); const Network *network);
bool hasNext() { return next_; } bool hasNext() override { return next_; }
Instance *next(); Instance *next() override;
private: private:
void nextInst(); void nextInst();
@ -1366,8 +1366,8 @@ class ConnectedPinIterator1 : public ConnectedPinIterator
public: public:
ConnectedPinIterator1(PinSet *pins); ConnectedPinIterator1(PinSet *pins);
virtual ~ConnectedPinIterator1(); virtual ~ConnectedPinIterator1();
virtual bool hasNext(); bool hasNext() override;
virtual const Pin *next(); const Pin *next() override;
protected: protected:
PinSet *pins_; PinSet *pins_;

4
search/PathEnum.hh
View File

@ -68,8 +68,8 @@ public:
// Insert path ends that are enumerated in slack/arrival order. // Insert path ends that are enumerated in slack/arrival order.
void insert(PathEnd *path_end); void insert(PathEnd *path_end);
virtual ~PathEnum(); virtual ~PathEnum();
virtual bool hasNext(); bool hasNext() override;
virtual PathEnd *next(); PathEnd *next() override;
private: private:
void makeDiversions(PathEnd *path_end, void makeDiversions(PathEnd *path_end,

20
verilog/VerilogReader.cc
View File

@ -1080,8 +1080,8 @@ VerilogAssign::~VerilogAssign()
class VerilogNullNetNameIterator : public VerilogNetNameIterator class VerilogNullNetNameIterator : public VerilogNetNameIterator
{ {
public: public:
virtual bool hasNext() { return false; } bool hasNext() override { return false; }
virtual const std::string &next(); const std::string &next() override;
}; };
const std::string & const std::string &
@ -1095,8 +1095,8 @@ class VerilogOneNetNameIterator : public VerilogNetNameIterator
{ {
public: public:
VerilogOneNetNameIterator(const std::string &name); VerilogOneNetNameIterator(const std::string &name);
virtual bool hasNext(); bool hasNext() override;
virtual const std::string &next(); const std::string &next() override;
protected: protected:
std::string name_; std::string name_;
@ -1128,8 +1128,8 @@ public:
VerilogBusNetNameIterator(const std::string bus_name, VerilogBusNetNameIterator(const std::string bus_name,
int from_index, int from_index,
int to_index); int to_index);
virtual bool hasNext(); bool hasNext() override;
virtual const std::string &next(); const std::string &next() override;
protected: protected:
const std::string bus_name_; const std::string bus_name_;
@ -1182,8 +1182,8 @@ public:
VerilogConstantNetNameIterator(VerilogConstantValue *value, VerilogConstantNetNameIterator(VerilogConstantValue *value,
const std::string &zero, const std::string &zero,
const std::string &one); const std::string &one);
virtual bool hasNext(); bool hasNext() override;
virtual const std::string &next(); const std::string &next() override;
private: private:
VerilogConstantValue *value_; VerilogConstantValue *value_;
@ -1222,8 +1222,8 @@ public:
VerilogModule *module, VerilogModule *module,
VerilogReader *reader); VerilogReader *reader);
virtual ~VerilogNetConcatNameIterator(); virtual ~VerilogNetConcatNameIterator();
virtual bool hasNext(); bool hasNext() override;
virtual const std::string &next(); const std::string &next() override;
private: private:
VerilogModule *module_; VerilogModule *module_;