rm StringSet

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

CMakeLists.txt

@@ -234,7 +234,6 @@ set(STA_SOURCE
   util/RiseFallMinMaxDelay.cc
   util/RiseFallValues.cc
   util/Stats.cc
-  util/StringSet.cc
   util/StringUtil.cc
   util/Transition.cc
   

include/sta/Sdc.hh

@@ -30,7 +30,6 @@
 #include <mutex>
 
 #include "StringUtil.hh"
-#include "StringSet.hh"
 #include "MinMax.hh"
 #include "StaState.hh"
 #include "NetworkClass.hh"

include/sta/SearchClass.hh

@@ -29,7 +29,6 @@
 #include <map>
 
 #include "VectorMap.hh"
-#include "StringSet.hh"
 #include "MinMaxValues.hh"
 #include "Delay.hh"
 #include "NetworkClass.hh"

include/sta/StringSet.hh

@@ -1,38 +0,0 @@
-// OpenSTA, Static Timing Analyzer
-// Copyright (c) 2025, Parallax Software, Inc.
-// 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-// 
-// The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software.
-// 
-// Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 
-// This notice may not be removed or altered from any source distribution.
-#pragma once
-
-#include <set>
-
-#include "StringUtil.hh"
-
-namespace sta {
-
-using StringSet = std::set<const char*, CharPtrLess>;
-using StdStringSet = std::set<std::string>;
-
-void
-deleteContents(StringSet *strings);
-
-} // namespace

include/sta/StringUtil.hh

@@ -28,12 +28,14 @@
 #include <cstring>
 #include <string>
 #include <vector>
+#include <set>
 
 #include "Machine.hh" // __attribute__
 
 namespace sta {
 
 using StdStringSeq = std::vector<std::string>;
+using StdStringSet = std::set<std::string>;
 
 inline bool
 stringEq(const char *str1,

include/sta/TclTypeHelpers.hh

@@ -22,20 +22,17 @@
 // 
 // This notice may not be removed or altered from any source distribution.
 
-#include "ArcDelayCalc.hh"
-#include "StringSet.hh"
-
 #include <tcl.h>
 
+#include "ArcDelayCalc.hh"
+#include "StringUtil.hh"
+
 namespace sta {
 
 #if TCL_MAJOR_VERSION < 9
     typedef int Tcl_Size;
 #endif
 
-StringSet *
-tclListSetConstChar(Tcl_Obj *const source,
-                    Tcl_Interp *interp);
 StdStringSeq
 tclListSeqStdString(Tcl_Obj *const source,
                     Tcl_Interp *interp);

include/sta/VerilogReader.hh

@@ -28,7 +28,7 @@
 #include <vector>
 #include <map>
 
-#include "StringSet.hh"
+#include "StringUtil.hh"
 #include "NetworkClass.hh"
 
 namespace sta {

liberty/Liberty.cc

@@ -31,7 +31,6 @@
 #include "Debug.hh"
 #include "Error.hh"
 #include "StringUtil.hh"
-#include "StringSet.hh"
 #include "PatternMatch.hh"
 #include "Units.hh"
 #include "Transition.hh"

spice/WritePathSpice.hh

@@ -24,7 +24,6 @@
 
 #pragma once
 
-#include "StringSet.hh"
 #include "CircuitSim.hh"
 
 namespace sta {

spice/WriteSpice.hh

@@ -30,7 +30,6 @@
 #include <vector>
 
 #include "StaState.hh"
-#include "StringSet.hh"
 #include "StringUtil.hh"
 #include "Liberty.hh"
 #include "GraphClass.hh"

tcl/StaTclTypes.i

@@ -27,7 +27,6 @@
 
 #include "Machine.hh"
 #include "StringUtil.hh"
-#include "StringSet.hh"
 #include "PatternMatch.hh"
 #include "Network.hh"
 #include "Liberty.hh"
@@ -1227,10 +1226,6 @@ using namespace sta;
   Tcl_SetObjResult(interp,Tcl_NewDoubleObj(delayAsFloat($1)));
 }
 
-%typemap(in) StringSet* {
-  $1 = tclListSetConstChar($input, interp);
-}
-
 %typemap(out) Mode* {
   const Mode *mode = $1;
   if (mode)

tcl/TclTypeHelpers.cc

@@ -30,26 +30,6 @@
 
 namespace sta {
 
-StringSet *
-tclListSetConstChar(Tcl_Obj *const source,
-                    Tcl_Interp *interp)
-{
-  Tcl_Size argc;
-  Tcl_Obj **argv;
-
-  if (Tcl_ListObjGetElements(interp, source, &argc, &argv) == TCL_OK) {
-    StringSet *set = new StringSet;
-    for (int i = 0; i < argc; i++) {
-      int length;
-      const char *str = Tcl_GetStringFromObj(argv[i], &length);
-      set->insert(str);
-    }
-    return set;
-  }
-  else
-    return nullptr;
-}
-
 StdStringSeq
 tclListSeqStdString(Tcl_Obj *const source,
                     Tcl_Interp *interp)

util/StringSet.cc

@@ -1,36 +0,0 @@
-// OpenSTA, Static Timing Analyzer
-// Copyright (c) 2025, Parallax Software, Inc.
-// 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-// 
-// The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software.
-// 
-// Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 
-// This notice may not be removed or altered from any source distribution.
-
-#include "StringSet.hh"
-
-namespace sta {
-
-void
-deleteContents(StringSet *strings)
-{
-  for (const char *string : *strings)
-    stringDelete(string);
-}
-
-} // namespace