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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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