rm TokenParser

Signed-off-by: James Cherry <cherry@parallaxsw.com>

util/StringUtil.cc

@@ -269,12 +269,11 @@ trimRight(string &str)
   str.erase(str.find_last_not_of(" ") + 1);
 }
 
-void
+StdStringSeq
 split(const string &text,
-      const string &delims,
-      // Return values.
-      StringVector &tokens)
+      const string &delims)
 {
+  StdStringSeq tokens;
   auto start = text.find_first_not_of(delims);
   auto end = text.find_first_of(delims, start);
   while (end != string::npos) {
@@ -284,6 +283,28 @@ split(const string &text,
   }
   if (start != string::npos)
     tokens.push_back(text.substr(start));
+  return tokens;
+}
+
+// Parse space separated tokens.
+StdStringSeq
+parseTokens(const std::string &s,
+            const char delimiter)
+{
+  StdStringSeq tokens;
+  size_t i = 0;
+  while (i < s.size()) {
+    while (i < s.size() && std::isspace(s[i]))
+      ++i;
+    size_t start = i;
+    while (i < s.size() && s[i] != delimiter)
+      ++i;
+    if (start < i) {
+      tokens.emplace_back(s, start, i - start);
+      ++i;
+    }
+  }
+  return tokens;
 }
 
 } // namespace

util/TokenParser.cc

@@ -1,113 +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 "TokenParser.hh"
-
-#include <cctype>
-#include <cstring>
-
-namespace sta {
-
-TokenParser::TokenParser(const char *str,
-                         const char *delimiters) :
-  delimiters_(delimiters),
-  token_(const_cast<char*>(str)),
-  token_delimiter_('\0'),
-  first_(true)
-{
-  // Skip leading spaces.
-  while (*token_ != '\0' && isspace(*token_))
-    token_++;
-  token_end_ = strpbrk(token_, delimiters_);
-  if (token_end_) {
-    // Save the delimiter.
-    token_delimiter_ = *token_end_;
-    // Replace the separator with a terminator.
-    *token_end_ = '\0';
-  }
-}
-
-bool
-TokenParser::hasNext()
-{
-  if (!first_) {
-    // Replace the previous separator.
-    if (token_end_) {
-      *token_end_ = token_delimiter_;
-      token_ = token_end_ + 1;
-      // Skip spaces.
-      while (*token_ != '\0' && isspace(*token_))
-        token_++;
-      // Skip delimiters.
-      while (*token_ != '\0' && strchr(delimiters_,*token_) != nullptr)
-        token_++;
-      if (*token_ == '\0')
-        token_ = nullptr;
-      else {
-        token_end_ = strpbrk(token_, delimiters_);
-        if (token_end_) {
-          // Save the delimiter.
-          token_delimiter_ = *token_end_;
-          // Replace the separator with a terminator.
-          *token_end_ = '\0';
-        }
-      }
-    }
-    else
-      token_ = nullptr;
-  }
-  return token_ != nullptr;
-}
-
-char *
-TokenParser::next()
-{
-  first_ = false;
-  return token_;
-}
-
-////////////////////////////////////////////////////////////////
-
-// Parse space separated tokens.
-StdStringSeq
-parseTokens(const std::string &s,
-            const char delimiter)
-{
-  StdStringSeq tokens;
-  size_t i = 0;
-  while (i < s.size()) {
-    while (i < s.size() && std::isspace(s[i]))
-      ++i;
-    size_t start = i;
-    while (i < s.size() && s[i] != delimiter)
-      ++i;
-    if (start < i) {
-      tokens.emplace_back(s, start, i - start);
-      ++i;
-    }
-  }
-  return tokens;
-}
-
-} // namespace