Skip to content

Commit

Permalink
moving to string instead of std::string
Browse files Browse the repository at this point in the history 
Signed-off-by: Ethan Mahintorabi <[email protected]>
  • Loading branch information
@QuantamHD
QuantamHD committed Mar 13, 2024
1 parent d9244a7 commit 8b3e491
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 48 deletions.
8 changes: 4 additions & 4 deletions include/sta/ConcreteLibrary.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class LibertyCell;
class LibertyPort;

typedef Map<const char*, ConcreteCell*, CharPtrLess> ConcreteCellMap;
typedef Map<std::string, std::string> AttributeMap;
typedef Map<string, string> AttributeMap;
typedef Vector<ConcretePort*> ConcretePortSeq;
typedef Map<const char*, ConcretePort*, CharPtrLess> ConcretePortMap;
typedef ConcreteCellMap::ConstIterator ConcreteLibraryCellIterator;
Expand Down Expand Up @@ -106,9 +106,9 @@ public:
ConcreteCellPortBitIterator *portBitIterator() const;
bool isLeaf() const { return is_leaf_; }
void setIsLeaf(bool is_leaf);
void setAttribute(const std::string &key,
const std::string &value);
std::string getAttribute(const std::string &key) const;
void setAttribute(const string &key,
const string &value);
string getAttribute(const string &key) const;

// Cell acts as port factory.
ConcretePort *makePort(const char *name);
Expand Down
24 changes: 12 additions & 12 deletions include/sta/ConcreteNetwork.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class ConcreteBindingTbl;
class ConcreteLibertyLibraryIterator;

typedef Vector<ConcreteLibrary*> ConcreteLibrarySeq;
typedef Map<std::string, std::string> AttributeMap;
typedef Map<string, string> AttributeMap;
typedef Map<const char*, ConcreteLibrary*, CharPtrLess> ConcreteLibraryMap;
typedef ConcreteLibrarySeq::ConstIterator ConcreteLibraryIterator;
typedef Map<const char *, ConcreteInstance*,
Expand Down Expand Up @@ -75,8 +75,8 @@ public:
const PatternMatch *pattern) const override;

const char *name(const Cell *cell) const override;
std::string getAttribute(const Cell *cell,
const std::string &key) const override;
string getAttribute(const Cell *cell,
const string &key) const override;
ObjectId id(const Cell *cell) const override;
Library *library(const Cell *cell) const override;
LibertyCell *libertyCell(Cell *cell) const override;
Expand Down Expand Up @@ -111,8 +111,8 @@ public:
PortMemberIterator *memberIterator(const Port *port) const override;

const char *name(const Instance *instance) const override;
std::string getAttribute(const Instance *inst,
const std::string &key) const override;
string getAttribute(const Instance *inst,
const string &key) const override;
ObjectId id(const Instance *instance) const override;
Cell *cell(const Instance *instance) const override;
Instance *parent(const Instance *instance) const override;
Expand Down Expand Up @@ -181,8 +181,8 @@ public:
void setIsLeaf(Cell *cell,
bool is_leaf) override;
void setAttribute(Cell *cell,
const std::string &key,
const std::string &value) override;
const string &key,
const string &value) override;
Port *makePort(Cell *cell,
const char *name) override;
Port *makeBusPort(Cell *cell,
Expand Down Expand Up @@ -215,8 +215,8 @@ public:
LibertyPort *port,
Net *net) override;
void setAttribute(Instance *inst,
const std::string &key,
const std::string &value) override;
const string &key,
const string &value) override;
void disconnectPin(Pin *pin) override;
void deletePin(Pin *pin) override;
Net *makeNet(const char *name,
Expand Down Expand Up @@ -296,9 +296,9 @@ public:
InstanceNetIterator *netIterator() const;
Instance *findChild(const char *name) const;
InstanceChildIterator *childIterator() const;
void setAttribute(const std::string &key,
const std::string &value);
std::string getAttribute(const std::string &key) const;
void setAttribute(const string &key,
const string &value);
string getAttribute(const string &key) const;
void addChild(ConcreteInstance *child);
void deleteChild(ConcreteInstance *child);
void addPin(ConcretePin *pin);
Expand Down
16 changes: 8 additions & 8 deletions include/sta/Network.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ public:
// Filename may return null.
virtual const char *filename(const Cell *cell) = 0;
// Attributes can be null
virtual std::string getAttribute(const Cell *cell,
const std::string &key) const = 0;
virtual string getAttribute(const Cell *cell,
const string &key) const = 0;
// Name can be a simple, bundle, bus, or bus bit name.
virtual Port *findPort(const Cell *cell,
const char *name) const = 0;
Expand Down Expand Up @@ -209,8 +209,8 @@ public:
const PatternMatch *pattern) const;
virtual InstanceSeq findInstancesHierMatching(const Instance *instance,
const PatternMatch *pattern) const;
virtual std::string getAttribute(const Instance *inst,
const std::string &key) const = 0;
virtual string getAttribute(const Instance *inst,
const string &key) const = 0;
// Hierarchical path name.
virtual const char *pathName(const Instance *instance) const;
bool pathNameLess(const Instance *inst1,
Expand Down Expand Up @@ -550,11 +550,11 @@ public:
virtual void setIsLeaf(Cell *cell,
bool is_leaf) = 0;
virtual void setAttribute(Cell *cell,
const std::string &key,
const std::string &value) = 0;
const string &key,
const string &value) = 0;
virtual void setAttribute(Instance *instance,
const std::string &key,
const std::string &value) = 0;
const string &key,
const string &value) = 0;
virtual Port *makePort(Cell *cell,
const char *name) = 0;
virtual Port *makeBusPort(Cell *cell,
Expand Down
8 changes: 4 additions & 4 deletions include/sta/SdcNetwork.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ public:
const PatternMatch *pattern) const override;

const char *name(const Cell *cell) const override;
std::string getAttribute(const Cell *cell,
const std::string &key) const override;
string getAttribute(const Cell *cell,
const string &key) const override;
ObjectId id(const Cell *cell) const override;
Library *library(const Cell *cell) const override;
LibertyCell *libertyCell(Cell *cell) const override;
Expand Down Expand Up @@ -82,8 +82,8 @@ public:
bool hasMembers(const Port *port) const override;

ObjectId id(const Instance *instance) const override;
std::string getAttribute(const Instance *inst,
const std::string &key) const override;
string getAttribute(const Instance *inst,
const string &key) const override;
Instance *topInstance() const override;
Cell *cell(const Instance *instance) const override;
Instance *parent(const Instance *instance) const override;
Expand Down
8 changes: 4 additions & 4 deletions network/ConcreteLibrary.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,14 +269,14 @@ ConcreteCell::setIsLeaf(bool is_leaf)
}

void
ConcreteCell::setAttribute(const std::string &key,
const std::string &value)
ConcreteCell::setAttribute(const string &key,
const string &value)
{
attribute_map_.insert(key, value);
}

std::string
ConcreteCell::getAttribute(const std::string &key) const
string
ConcreteCell::getAttribute(const string &key) const
{
if (attribute_map_.hasKey(key)) {
return attribute_map_.findKey(key);
Expand Down
24 changes: 12 additions & 12 deletions network/ConcreteNetwork.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,8 +559,8 @@ ConcreteNetwork::setIsLeaf(Cell *cell,

void
ConcreteNetwork::setAttribute(Cell *cell,
const std::string &key,
const std::string &value)
const string &key,
const string &value)
{
ConcreteCell *ccell = reinterpret_cast<ConcreteCell*>(cell);
ccell->setAttribute(key, value);
Expand Down Expand Up @@ -606,9 +606,9 @@ ConcreteNetwork::filename(const Cell *cell)
return ccell->filename();
}

std::string
string
ConcreteNetwork::getAttribute(const Cell *cell,
const std::string &key) const
const string &key) const
{
const ConcreteCell *ccell = reinterpret_cast<const ConcreteCell*>(cell);
return ccell->getAttribute(key);
Expand Down Expand Up @@ -938,9 +938,9 @@ ConcreteNetwork::id(const Instance *instance) const
return inst->id();
}

std::string
string
ConcreteNetwork::getAttribute(const Instance *inst,
const std::string &key) const
const string &key) const
{
const ConcreteInstance *cinst = reinterpret_cast<const ConcreteInstance*>(inst);
return cinst->getAttribute(key);
Expand Down Expand Up @@ -1352,8 +1352,8 @@ ConcreteNetwork::connect(Instance *inst,

void
ConcreteNetwork::setAttribute(Instance *inst,
const std::string &key,
const std::string &value)
const string &key,
const string &value)
{
ConcreteInstance *cinst = reinterpret_cast<ConcreteInstance*>(inst);
cinst->setAttribute(key, value);
Expand Down Expand Up @@ -1683,14 +1683,14 @@ ConcreteInstance::childIterator() const
}

void
ConcreteInstance::setAttribute(const std::string &key,
const std::string &value)
ConcreteInstance::setAttribute(const string &key,
const string &value)
{
attribute_map_.insert(key, value);
}

std::string
ConcreteInstance::getAttribute(const std::string &key) const
string
ConcreteInstance::getAttribute(const string &key) const
{
if (attribute_map_.hasKey(key)) {
return attribute_map_.findKey(key);
Expand Down
8 changes: 4 additions & 4 deletions network/SdcNetwork.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ NetworkNameAdapter::id(const Cell *cell) const
return network_->id(cell);
}

std::string
string
NetworkNameAdapter::getAttribute(const Cell *cell,
const std::string &key) const
const string &key) const
{
return network_->getAttribute(cell, key);
}
Expand Down Expand Up @@ -334,9 +334,9 @@ NetworkNameAdapter::cell(const Instance *instance) const
return network_->cell(instance);
}

std::string
string
NetworkNameAdapter::getAttribute(const Instance *inst,
const std::string &key) const
const string &key) const
{
return network_->getAttribute(inst, key);
}
Expand Down

0 comments on commit 8b3e491

Please sign in to comment.