ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

utility: removed templates from utilityString functions to use std::deque by default

Browse Source
This commit is contained in:
Eberhard Graether
2014-09-11 17:37:18 +02:00
parent fec7abbc9b
commit 95ece9ef2e
9 changed files with 172 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/data/SearchIndex.cpp
+5 -5
View File
@@ -400,17 +400,17 @@ SearchIndex::SearchNode* SearchIndex::getNode(const std::string& fullName) const
std::vector<SearchIndex::SearchMatch> SearchIndex::findFuzzyMatches(const std::string& query) const
{
std::vector<std::string> names = utility::split<std::vector<std::string>>(query, '\"');
std::deque<std::string> names = utility::split(query, '\"');
if (names.size() == 3 && names[0].size() == 0)
if (names.size() == 3 && names.at(0).size() == 0)
{
SearchNode* node = getNode(names[1]);
SearchNode* node = getNode(names.at(1));
if (!node)
{
LOG_ERROR_STREAM(<< "Couldn't find node with name " << names[1] << " in the SearchIndex.");
LOG_ERROR_STREAM(<< "Couldn't find node with name " << names.at(1) << " in the SearchIndex.");
}
return node->findFuzzyMatches(names[2]);
return node->findFuzzyMatches(names.at(2));
}
return m_root.findFuzzyMatches(query);
src/lib/data/graph/token_component/TokenComponentName.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ std::shared_ptr<TokenComponent> TokenComponentNameCached::copy() const
const std::string& TokenComponentNameCached::getName() const
{
return utility::split<std::deque<std::string>>(m_fullName, SearchIndex::DELIMITER).back();
return utility::split(m_fullName, SearchIndex::DELIMITER).back();
}
std::string TokenComponentNameCached::getFullName() const
src/lib/data/query/QueryToken.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
QueryToken::QueryToken(const std::string& name)
{
std::deque<std::string> names = utility::split<std::deque<std::string>>(name, DELIMITER);
std::deque<std::string> names = utility::split(name, DELIMITER);
m_tokenName = names.front();
names.pop_front();
src/lib/data/query/QueryTree.cpp
+3 -4
View File
@@ -8,12 +8,11 @@
std::deque<std::string> QueryTree::tokenizeQuery(const std::string& query)
{
std::deque<std::string> tokensTmp =
utility::split<std::deque<std::string>>(query, QueryOperator::getOperator(QueryOperator::OPERATOR_NONE));
std::deque<std::string> tokensTmp = utility::split(query, QueryOperator::getOperator(QueryOperator::OPERATOR_NONE));
for (const std::pair<char, QueryOperator::OperatorType>& p : QueryOperator::getOperatorTypeMap())
{
tokensTmp = utility::tokenize<std::deque<std::string>>(tokensTmp, p.first);
tokensTmp = utility::tokenize(tokensTmp, p.first);
}
char operatorToken = QueryOperator::getOperator(QueryOperator::OPERATOR_TOKEN);
@@ -49,7 +48,7 @@ QueryTree::QueryTree(const std::string& query)
{
std::deque<std::string> tokens = tokenizeQuery(query);
m_query = utility::join<std::deque<std::string>>(tokens, ' ');
m_query = utility::join(tokens, ' ');
m_root = buildTree(tokens, nullptr);
}
src/lib/utility/text/Dictionary.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ Id Dictionary::getWordId(const std::string& word)
std::deque<Id> Dictionary::getWordIds(const std::string& wordList, const std::string& delimiter)
{
std::deque<std::string> words = utility::split<std::deque<std::string>>(wordList, delimiter);
std::deque<std::string> words = utility::split(wordList, delimiter);
std::deque<Id> ids;
for (const std::string& word: words)
src/lib/utility/utilityString.cpp
+97
View File
@@ -2,6 +2,103 @@
namespace utility
{
std::deque<std::string> split(const std::string& str, char delimiter)
{
return split(str, std::string(1, delimiter));
}
std::deque<std::string> split(const std::string& str, const std::string& delimiter)
{
size_t pos = 0;
size_t oldPos = 0;
std::deque<std::string> c;
do
{
pos = str.find(delimiter, oldPos);
c.push_back(str.substr(oldPos, pos - oldPos));
oldPos = pos + delimiter.size();
}
while (pos != std::string::npos);
return c;
}
std::string join(const std::deque<std::string>& list, char delimiter)
{
return join(list, std::string(1, delimiter));
}
std::string join(const std::deque<std::string>& list, const std::string& delimiter)
{
std::stringstream ss;
bool first = true;
for (const std::string& str : list)
{
if (!first)
{
ss << delimiter;
}
first = false;
ss << str;
}
return ss.str();
}
std::deque<std::string> tokenize(const std::string& str, char delimiter)
{
return tokenize(str, std::string(1, delimiter));
}
std::deque<std::string> tokenize(const std::string& str, const std::string& delimiter)
{
size_t pos = 0;
size_t oldPos = 0;
std::deque<std::string> c;
do
{
pos = str.find(delimiter, oldPos);
if (pos != oldPos)
{
c.push_back(str.substr(oldPos, pos - oldPos));
}
if (pos != std::string::npos)
{
c.push_back(str.substr(pos, delimiter.size()));
}
oldPos = pos + delimiter.size();
}
while (pos != std::string::npos && oldPos < str.size());
return c;
}
std::deque<std::string> tokenize(const std::deque<std::string>& list, char delimiter)
{
return tokenize(list, std::string(1, delimiter));
}
std::deque<std::string> tokenize(const std::deque<std::string>& list, const std::string& delimiter)
{
std::deque<std::string> c;
for (std::string str : list)
{
if (str.size())
{
std::deque<std::string> c2 = tokenize(str, delimiter);
c.insert(c.end(), c2.begin(), c2.end());
}
}
return c;
}
std::string substrAfter(const std::string& str, char delimiter)
{
size_t pos = str.find(delimiter);
src/lib/utility/utilityString.h
+9 -127
View File
@@ -1,144 +1,26 @@
#ifndef UTILITY_STRING_H
#define UTILITY_STRING_H
#include <deque>
#include <sstream>
#include <string>
#include <vector>
namespace utility
{
template<typename ContainerType>
ContainerType split(const std::string& str, char delimiter);
std::deque<std::string> split(const std::string& str, char delimiter);
std::deque<std::string> split(const std::string& str, const std::string& delimiter);
template<typename ContainerType>
ContainerType split(const std::string& str, const std::string& delimiter);
std::string join(const std::deque<std::string>& list, char delimiter);
std::string join(const std::deque<std::string>& list, const std::string& delimiter);
template<typename ContainerType>
std::string join(const ContainerType& list, char delimiter);
template<typename ContainerType>
std::string join(const ContainerType& list, const std::string& delimiter);
template<typename ContainerType>
ContainerType tokenize(const std::string& str, char delimiter);
template<typename ContainerType>
ContainerType tokenize(const std::string& str, const std::string& delimiter);
template<typename ContainerType>
ContainerType tokenize(const ContainerType& list, char delimiter);
template<typename ContainerType>
ContainerType tokenize(const ContainerType& list, const std::string& delimiter);
std::deque<std::string> tokenize(const std::string& str, char delimiter);
std::deque<std::string> tokenize(const std::string& str, const std::string& delimiter);
std::deque<std::string> tokenize(const std::deque<std::string>& list, char delimiter);
std::deque<std::string> tokenize(const std::deque<std::string>& list, const std::string& delimiter);
std::string substrAfter(const std::string& str, char delimiter);
bool isPrefix(const std::string& prefix, const std::string& text);
}
template<typename ContainerType>
ContainerType utility::split(const std::string& str, char delimiter)
{
return split<ContainerType>(str, std::string(1, delimiter));
}
template<typename ContainerType>
ContainerType utility::split(const std::string& str, const std::string& delimiter)
{
size_t pos = 0;
size_t oldPos = 0;
ContainerType c;
do
{
pos = str.find(delimiter, oldPos);
c.push_back(str.substr(oldPos, pos - oldPos));
oldPos = pos + delimiter.size();
}
while (pos != std::string::npos);
return c;
}
template<typename ContainerType>
std::string utility::join(const ContainerType& list, char delimiter)
{
return join<ContainerType>(list, std::string(1, delimiter));
}
template<typename ContainerType>
std::string utility::join(const ContainerType& list, const std::string& delimiter)
{
std::stringstream ss;
bool first = true;
for (const std::string& str : list)
{
if (!first)
{
ss << delimiter;
}
first = false;
ss << str;
}
return ss.str();
}
template<typename ContainerType>
ContainerType utility::tokenize(const std::string& str, char delimiter)
{
return tokenize<ContainerType>(str, std::string(1, delimiter));
}
template<typename ContainerType>
ContainerType utility::tokenize(const std::string& str, const std::string& delimiter)
{
size_t pos = 0;
size_t oldPos = 0;
ContainerType c;
do
{
pos = str.find(delimiter, oldPos);
if (pos != oldPos)
{
c.push_back(str.substr(oldPos, pos - oldPos));
}
if (pos != std::string::npos)
{
c.push_back(str.substr(pos, delimiter.size()));
}
oldPos = pos + delimiter.size();
}
while (pos != std::string::npos && oldPos < str.size());
return c;
}
template<typename ContainerType>
ContainerType utility::tokenize(const ContainerType& list, char delimiter)
{
return tokenize<ContainerType>(list, std::string(1, delimiter));
}
template<typename ContainerType>
ContainerType utility::tokenize(const ContainerType& list, const std::string& delimiter)
{
ContainerType c;
for (std::string str : list)
{
if (str.size())
{
ContainerType c2 = tokenize<ContainerType>(str, delimiter);
c.insert(c.end(), c2.begin(), c2.end());
}
}
return c;
}
#endif // UTILITY_STRING_H