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 6

Lexer

Browse source 
- Replaced old digitsOnly() function with Lexer::isAllDigits.
This commit is contained in:
Paul Beckingham 2015-02-22 20:23:00 -05:00
parent 9f82926c65
commit 26aff348d2
7 changed files with 9 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/CLI.cpp
View file

@ -1345,7 +1345,7 @@ void CLI::findIDs ()
if (terms.size () == 1)
{
if (! digitsOnly (terms[0]))
if (! Lexer::isAllDigits (terms[0]))
{
is_an_id = false;
break;
@ -1366,8 +1366,8 @@ void CLI::findIDs ()
}
else if (terms.size () == 2)
{
if (! digitsOnly (terms[0]) ||
! digitsOnly (terms[1]))
if (! Lexer::isAllDigits (terms[0]) ||
! Lexer::isAllDigits (terms[1]))
{
is_an_id = false;
break;
@ -2206,7 +2206,7 @@ bool CLI::isIDSequence (const std::string& raw) const
////////////////////////////////////////////////////////////////////////////////
bool CLI::isID (const std::string& raw) const
{
return digitsOnly (raw);
return Lexer::isAllDigits (raw);
}
////////////////////////////////////////////////////////////////////////////////

2
src/Date.cpp
View file

@ -823,7 +823,7 @@ void Date::operator++ (int)
////////////////////////////////////////////////////////////////////////////////
bool Date::isEpoch (const std::string& input)
{
if (digitsOnly (input) &&
if (Lexer::isAllDigits (input) &&
input.length () <= 10 )
{
_t = (time_t) atoi (input.c_str ());

2
src/Duration.cpp
View file

@ -107,7 +107,7 @@ Duration::Duration (time_t input)
Duration::Duration (const std::string& input)
: _secs (0)
{
if (digitsOnly (input))
if (Lexer::isAllDigits (input))
{
time_t value = (time_t) strtol (input.c_str (), NULL, 10);
if (value == 0 || value > 60)

4
src/commands/CmdCalendar.cpp
View file

@ -120,11 +120,11 @@ int CmdCalendar::execute (std::string& output)
argWholeYear = true;
// YYYY.
else if (digitsOnly (*arg) && arg->length () == 4)
else if (Lexer::isAllDigits (*arg) && arg->length () == 4)
argYear = strtol (arg->c_str (), NULL, 10);
// MM.
else if (digitsOnly (*arg) && arg->length () <= 2)
else if (Lexer::isAllDigits (*arg) && arg->length () <= 2)
{
argMonth = strtol (arg->c_str (), NULL, 10);
if (argMonth < 1 || argMonth > 12)

10
src/text.cpp
View file

@ -479,16 +479,6 @@ bool nontrivial (const std::string& input)
return false;
}
////////////////////////////////////////////////////////////////////////////////
bool digitsOnly (const std::string& input)
{
for (size_t i = 0; i < input.length (); ++i)
if (!isdigit (input[i]))
return false;
return true;
}
////////////////////////////////////////////////////////////////////////////////
// Override of ispunct, that considers #, $ and @ not to be punctuation.
//

1
src/text.h
View file

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

8
test/text.t.cpp
View file

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