GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Text

Browse source 
- Removed obsolete noSpaces() function.
This commit is contained in:
Paul Beckingham 2015-02-22 18:27:19 -05:00
parent 8791c0a921
commit 9f82926c65
4 changed files with 3 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CLI.cpp
View file

@ -849,7 +849,7 @@ void CLI::categorize ()
a->tag ("MODIFICATION"); a->tag ("MODIFICATION");
// If the argument contains a space, it was quoted. Record that. // If the argument contains a space, it was quoted. Record that.
if (! noSpaces (raw)) if (! Lexer::isOneWord (raw))
a->tag ("QUOTED"); a->tag ("QUOTED");
changes = true; changes = true;
@ -859,7 +859,7 @@ void CLI::categorize ()
a->tag ("FILTER"); a->tag ("FILTER");
// If the argument contains a space, it was quoted. Record that. // If the argument contains a space, it was quoted. Record that.
if (! noSpaces (raw)) if (! Lexer::isOneWord (raw))
a->tag ("QUOTED"); a->tag ("QUOTED");
changes = true; changes = true;

12
src/text.cpp
View file

@ -489,18 +489,6 @@ bool digitsOnly (const std::string& input)
return true; return true;
} }
////////////////////////////////////////////////////////////////////////////////
bool noSpaces (const std::string& input)
{
std::string::size_type i = 0;
int character;
while ((character = utf8_next_char (input, i)))
if (Lexer::isWhitespace (character))
return false;
return true;
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Override of ispunct, that considers #, $ and @ not to be punctuation. // Override of ispunct, that considers #, $ and @ not to be punctuation.
// //

1
src/text.h
View file

@ -51,7 +51,6 @@ const std::string str_replace (const std::string&, const std::string&, const std
const char* optionalBlankLine (); const char* optionalBlankLine ();
bool nontrivial (const std::string&); bool nontrivial (const std::string&);
bool digitsOnly (const std::string&); bool digitsOnly (const std::string&);
bool noSpaces (const std::string&);
bool isPunctuation (char); bool isPunctuation (char);
bool compare (const std::string&, const std::string&, bool sensitive = true); bool compare (const std::string&, const std::string&, bool sensitive = true);
bool closeEnough (const std::string&, const std::string&, unsigned int minLength = 0); bool closeEnough (const std::string&, const std::string&, unsigned int minLength = 0);

9
test/text.t.cpp
View file

@ -37,7 +37,7 @@ Context context;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int main (int argc, char** argv) int main (int argc, char** argv)
{ {
UnitTest t (214); UnitTest t (209);
// Ensure environment has no influence. // Ensure environment has no influence.
unsetenv ("TASKDATA"); unsetenv ("TASKDATA");
@ -296,13 +296,6 @@ int main (int argc, char** argv)
t.ok (digitsOnly ("123"), "digitsOnly '123' -> true"); t.ok (digitsOnly ("123"), "digitsOnly '123' -> true");
t.notok (digitsOnly ("12fa"), "digitsOnly '12fa' -> false"); t.notok (digitsOnly ("12fa"), "digitsOnly '12fa' -> false");
// bool noSpaces (const std::string&);
t.ok (noSpaces (""), "noSpaces '' -> true");
t.ok (noSpaces ("a"), "noSpaces 'a' -> true");
t.ok (noSpaces ("abc"), "noSpaces 'abc' -> true");
t.notok (noSpaces (" "), "noSpaces ' ' -> false");
t.notok (noSpaces ("ab cd"), "noSpaces 'ab cd' -> false");
// bool compare (const std::string&, const std::string&, bool caseless = false); // bool compare (const std::string&, const std::string&, bool caseless = false);
// Make sure degenerate cases are handled. // Make sure degenerate cases are handled.
t.ok (compare ("", ""), "'' == ''"); t.ok (compare ("", ""), "'' == ''");