From e972d832155b0c3e91f26c287f7f23037e17f6de Mon Sep 17 00:00:00 2001 From: Luca Fedeli Date: Fri, 21 Apr 2023 22:28:12 +0200 Subject: move StringUtils.H to ablastr (#3864) --- Source/Utils/Parser/IntervalsParser.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'Source/Utils/Parser/IntervalsParser.cpp') diff --git a/Source/Utils/Parser/IntervalsParser.cpp b/Source/Utils/Parser/IntervalsParser.cpp index aab2cbe30..91e5edb28 100644 --- a/Source/Utils/Parser/IntervalsParser.cpp +++ b/Source/Utils/Parser/IntervalsParser.cpp @@ -8,8 +8,8 @@ #include "IntervalsParser.H" +#include "ablastr/utils/text/StringUtils.H" #include "ParserUtils.H" -#include "Utils/Strings/StringUtils.H" #include "Utils/TextMsg.H" #include @@ -18,11 +18,10 @@ utils::parser::SliceParser::SliceParser (const std::string& instr, const bool isBTD) { - namespace utils_str = utils::strings; - m_isBTD = isBTD; // split string and trim whitespaces - auto insplit = utils_str::split>(instr, m_separator, true); + auto insplit = ablastr::utils::text::split_string>( + instr, m_separator, true); if(insplit.size() == 1){ // no colon in input string. The input is the period. WARPX_ALWAYS_ASSERT_WITH_MESSAGE(!m_isBTD, "must specify interval stop for BTD"); @@ -92,12 +91,11 @@ int utils::parser::SliceParser::numContained () const { utils::parser::IntervalsParser::IntervalsParser ( const std::vector& instr_vec) { - namespace utils_str = utils::strings; - std::string inconcatenated; for (const auto& instr_element : instr_vec) inconcatenated +=instr_element; - auto insplit = utils_str::split>(inconcatenated, m_separator); + auto insplit = ablastr::utils::text::split_string>( + inconcatenated, m_separator); for(const auto& inslc : insplit) { @@ -159,7 +157,8 @@ utils::parser::BTDIntervalsParser::BTDIntervalsParser ( std::string inconcatenated; for (const auto& instr_element : instr_vec) inconcatenated +=instr_element; - auto const insplit = utils::strings::split>(inconcatenated, std::string(1,m_separator)); + auto const insplit = ablastr::utils::text::split_string>( + inconcatenated, std::string(1,m_separator)); // parse the Intervals string into Slices and store each slice in m_slices, // in order of increasing Slice start value -- cgit v1.2.3