miloignis/kraken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use std::string::substr() instead of adding one character at a time. This patch also removes a few unused util functions that are easily written using substr().

Browse Source
This commit is contained in:
Jason Orendorff
2013-10-25 02:42:12 -07:00
parent 727529fe0b
commit 83af1b1c5a
3 changed files with 3 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/util.h
View File

@@ -10,8 +10,6 @@
#include <sstream>
std::string intToString(int theInt);
std::string truncateEnd(std::string to_truncate);
std::string removeBeginning(std::string to_remove);
std::string replaceExEscape(std::string first, std::string search, std::string replace);
#endif
#endif

22
src/StringReader.cpp
View File

@@ -85,18 +85,8 @@ std::string StringReader::getTokens(const char *stop_chars, bool truncateEnd)
if (rd_string[str_pos] == '\"')
found_pos++;
std::string string_section;
for (; str_pos <= found_pos; str_pos++)
{
string_section += rd_string[str_pos];
}
// if (str_pos <= found_pos) {
// string_section = rd_string.substr(str_pos, found_pos+1);
// str_pos = found_pos+1;
// }
// std::cout << string_section << " - " << str_pos << " - " << found_pos << std::endl;
std::string string_section = rd_string.substr(str_pos, found_pos - str_pos + 1);
str_pos = found_pos + 1;
if (truncateEnd) //Ok, we didn't add the last char, but str_pos now points at that char. So we move it one ahead.
str_pos++;
@@ -104,14 +94,6 @@ std::string StringReader::getTokens(const char *stop_chars, bool truncateEnd)
}
}
std::string StringReader::truncateEnd(std::string to_truncate)
{
std::string to_return = "";
for (unsigned int i = 0; i < to_truncate.length()-1; i++)
to_return = to_return + to_truncate[i];
return to_return;
}
void StringReader::test()
{
{

15
src/util.cpp
View File

@@ -5,21 +5,6 @@ std::string intToString(int theInt) {
converter << theInt;
return converter.str();
}
std::string truncateEnd(std::string to_truncate)
{
std::string to_return = "";
for (unsigned int i = 0; i < to_truncate.length()-1; i++)
to_return = to_return + to_truncate[i];
return to_return;
}
std::string removeBeginning(std::string to_remove)
{
std::string to_return = "";
for (unsigned int i = 1; i < to_remove.length(); i++)
to_return = to_return + to_remove[i];
return to_return;
}
std::string replaceExEscape(std::string first, std::string search, std::string replace) {
size_t pos = 0;