gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

util: Migrated strippedLength from text

Browse Source
This commit is contained in:
Paul Beckingham
2016-12-11 17:39:11 -05:00
parent 14e3038571
commit b4e4727887
5 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/text.cpp
View File

@@ -53,30 +53,3 @@ const char* optionalBlankLine ()
}
////////////////////////////////////////////////////////////////////////////////
// Return the length, in characters, of the input, subtracting color control
// codes.
int strippedLength (const std::string& input)
{
int length = input.length ();
bool inside = false;
int count = 0;
for (int i = 0; i < length; ++i)
{
if (inside)
{
if (input[i] == 'm')
inside = false;
}
else
{
if (input[i] == 033)
inside = true;
else
++count;
}
}
return count;
}
////////////////////////////////////////////////////////////////////////////////

27
src/util.cpp
View File

@@ -328,3 +328,30 @@ bool nontrivial (const std::string& input)
}
////////////////////////////////////////////////////////////////////////////////
// Return the length, in characters, of the input, subtracting color control
// codes.
int strippedLength (const std::string& input)
{
int length = input.length ();
bool inside = false;
int count = 0;
for (int i = 0; i < length; ++i)
{
if (inside)
{
if (input[i] == 'm')
inside = false;
}
else
{
if (input[i] == 033)
inside = true;
else
++count;
}
}
return count;
}
////////////////////////////////////////////////////////////////////////////////

1
src/util.h
View File

@@ -63,6 +63,7 @@ const std::vector <std::string> extractParents (
std::string osName ();
const std::string obfuscateText (const std::string&);
bool nontrivial (const std::string&);
int strippedLength (const std::string&);
#endif
////////////////////////////////////////////////////////////////////////////////

9
test/text.t.cpp
View File

@@ -37,14 +37,7 @@ Context context;
////////////////////////////////////////////////////////////////////////////////
int main (int, char**)
{
UnitTest t (5);
// int strippedLength (const std::string&);
t.is (strippedLength (std::string ("")), 0, "strippedLength -> 0");
t.is (strippedLength (std::string ("abc")), 3, "strippedLength abc -> 3");
t.is (strippedLength (std::string ("one\033[5;38;255mtwo\033[0mthree")), 11, "strippedLength one^[[5;38;255mtwo^[[0mthree -> 11");
t.is (strippedLength (std::string ("\033[0m")), 0, "strippedLength ^[[0m -> 0");
t.is (strippedLength (std::string ("\033[1m\033[0m")), 0, "strippedLength ^[[1m^[[0m -> 0");
UnitTest t (0);
return 0;
}

9
test/util.t.cpp
View File

@@ -36,7 +36,7 @@ Context context;
////////////////////////////////////////////////////////////////////////////////
int main (int, char**)
{
UnitTest t (19);
UnitTest t (24);
// Ensure environment has no influence.
unsetenv ("TASKDATA");
@@ -86,6 +86,13 @@ int main (int, char**)
t.ok (nontrivial (" \t\ta"), "nontrivial ' \\t\\ta' -> true");
t.ok (nontrivial ("a\t\t "), "nontrivial 'a\\t\\t ' -> true");
// int strippedLength (const std::string&);
t.is (strippedLength (std::string ("")), 0, "strippedLength -> 0");
t.is (strippedLength (std::string ("abc")), 3, "strippedLength abc -> 3");
t.is (strippedLength (std::string ("one\033[5;38;255mtwo\033[0mthree")), 11, "strippedLength one^[[5;38;255mtwo^[[0mthree -> 11");
t.is (strippedLength (std::string ("\033[0m")), 0, "strippedLength ^[[0m -> 0");
t.is (strippedLength (std::string ("\033[1m\033[0m")), 0, "strippedLength ^[[1m^[[0m -> 0");
return 0;
}