delay_calcs use std::string

Signed-off-by: James Cherry <[email protected]>

dcalc/DelayCalc.cc

@@ -25,6 +25,7 @@
 #include "DelayCalc.hh"
 
 #include <map>
+#include <string>
 
 #include "ContainerHelpers.hh"
 #include "StringUtil.hh"
@@ -37,9 +38,9 @@
 
 namespace sta {
 
-typedef std::map<const char*, MakeArcDelayCalc, CharPtrLess> DelayCalcMap;
+typedef std::map<std::string, MakeArcDelayCalc> DelayCalcMap;
 
-static DelayCalcMap *delay_calcs = nullptr;
+static DelayCalcMap delay_calcs;
 
 void
 registerDelayCalcs()
@@ -54,26 +55,23 @@ registerDelayCalcs()
 }
 
 void
-registerDelayCalc(const char *name,
+registerDelayCalc(const std::string &name,
                   MakeArcDelayCalc maker)
 {
-  if (delay_calcs == nullptr)
+  delay_calcs[name] = maker;
-    delay_calcs = new DelayCalcMap;
-  (*delay_calcs)[name] = maker;
 }
 
 void
 deleteDelayCalcs()
 {
-  delete delay_calcs;
+  delay_calcs.clear();
-  delay_calcs = nullptr;
 }
 
 ArcDelayCalc *
-makeDelayCalc(const char *name,
+makeDelayCalc(const std::string &name,
               StaState *sta)
 {
-  MakeArcDelayCalc maker = findKey(delay_calcs, name);
+  MakeArcDelayCalc maker = findKey(&delay_calcs, name);
   if (maker)
     return maker(sta);
   else
@@ -81,16 +79,16 @@ makeDelayCalc(const char *name,
 }
 
 bool
-isDelayCalcName(const char *name)
+isDelayCalcName(const std::string &name)
 {
-  return delay_calcs->contains(name);
+  return delay_calcs.contains(name);
 }
 
-StringSeq
+StdStringSeq
 delayCalcNames()
 {
-  StringSeq names;
+  StdStringSeq names;
-  for (const auto [name, make_dcalc] : *delay_calcs)
+  for (const auto &[name, make_dcalc] : delay_calcs)
     names.push_back(name);
   return names;
 }

dcalc/DelayCalc.i

@@ -36,7 +36,7 @@
 
 %inline %{
 
-StringSeq
+StdStringSeq
 delay_calc_names()
 {
   return sta::delayCalcNames();

include/sta/DelayCalc.hh

@@ -24,7 +24,9 @@
 
 #pragma once
 
-#include "StringSeq.hh"
+#include <string>
+
+#include "StringUtil.hh"
 
 namespace sta {
 
@@ -38,18 +40,18 @@ void
 registerDelayCalcs();
 // Register a delay calculator for the set_delay_calc command.
 void
-registerDelayCalc(const char *name,
+registerDelayCalc(const std::string &name,
                   MakeArcDelayCalc maker);
 bool
-isDelayCalcName(const char *name);
+isDelayCalcName(const std::string &name);
-StringSeq
+StdStringSeq
 delayCalcNames();
 void
 deleteDelayCalcs();
 
 // Make a registered delay calculator by name.
 ArcDelayCalc *
-makeDelayCalc(const char *name,
+makeDelayCalc(const std::string &name,
               StaState *sta);
 
 } // namespace