From 8b3e49188c2345fc0b96e6740292ee12eb5d692b Mon Sep 17 00:00:00 2001
From: Ethan Mahintorabi <ethanmoon@google.com>
Date: Wed, 13 Mar 2024 00:00:47 +0000
Subject: [PATCH] moving to string instead of std::string

Signed-off-by: Ethan Mahintorabi <ethanmoon@google.com>
---
 include/sta/ConcreteLibrary.hh |  8 ++++----
 include/sta/ConcreteNetwork.hh | 24 ++++++++++++------------
 include/sta/Network.hh         | 16 ++++++++--------
 include/sta/SdcNetwork.hh      |  8 ++++----
 network/ConcreteLibrary.cc     |  8 ++++----
 network/ConcreteNetwork.cc     | 24 ++++++++++++------------
 network/SdcNetwork.cc          |  8 ++++----
 7 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/include/sta/ConcreteLibrary.hh b/include/sta/ConcreteLibrary.hh
index afad639d..bacd91a0 100644
--- a/include/sta/ConcreteLibrary.hh
+++ b/include/sta/ConcreteLibrary.hh
@@ -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;
@@ -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);
diff --git a/include/sta/ConcreteNetwork.hh b/include/sta/ConcreteNetwork.hh
index e248ad06..06528214 100644
--- a/include/sta/ConcreteNetwork.hh
+++ b/include/sta/ConcreteNetwork.hh
@@ -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*,
@@ -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;
@@ -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;
@@ -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,
@@ -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,
@@ -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);
diff --git a/include/sta/Network.hh b/include/sta/Network.hh
index b05a65c6..001826ac 100644
--- a/include/sta/Network.hh
+++ b/include/sta/Network.hh
@@ -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;
@@ -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,
@@ -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,
diff --git a/include/sta/SdcNetwork.hh b/include/sta/SdcNetwork.hh
index ed929537..6f6a2e1f 100644
--- a/include/sta/SdcNetwork.hh
+++ b/include/sta/SdcNetwork.hh
@@ -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;
@@ -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;
diff --git a/network/ConcreteLibrary.cc b/network/ConcreteLibrary.cc
index 1cbd2a39..e6cceeef 100644
--- a/network/ConcreteLibrary.cc
+++ b/network/ConcreteLibrary.cc
@@ -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);
diff --git a/network/ConcreteNetwork.cc b/network/ConcreteNetwork.cc
index a75dbc75..c6c3cd00 100644
--- a/network/ConcreteNetwork.cc
+++ b/network/ConcreteNetwork.cc
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
diff --git a/network/SdcNetwork.cc b/network/SdcNetwork.cc
index 00d7a07e..0973ed0c 100644
--- a/network/SdcNetwork.cc
+++ b/network/SdcNetwork.cc
@@ -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);
 }
@@ -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);
 }