GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-29 17:07:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Cleanup

Browse source 
- Removed unused Nibbler::getHex.
This commit is contained in:
Paul Beckingham 2015-02-17 10:58:45 -05:00
parent 520067f522
commit c11601e30e
3 changed files with 4 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/Nibbler.cpp
View file

@ -403,33 +403,6 @@ bool Nibbler::getInt (int& result)
return false; return false;
} }
////////////////////////////////////////////////////////////////////////////////
bool Nibbler::getHex (int& result)
{
std::string::size_type i = _cursor;
if (i < _length)
{
if (_input[i] == '-')
++i;
else if (_input[i] == '+')
++i;
}
// TODO Potential for use of find_first_not_of
while (i < _length && isxdigit (_input[i]))
++i;
if (i > _cursor)
{
result = strtoimax (_input.substr (_cursor, i - _cursor).c_str (), NULL, 16);
_cursor = i;
return true;
}
return false;
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
bool Nibbler::getUnsignedInt (int& result) bool Nibbler::getUnsignedInt (int& result)
{ {

1
src/Nibbler.h
View file

@ -68,7 +68,6 @@ public:
bool getDigit3 (int&); bool getDigit3 (int&);
bool getDigit2 (int&); bool getDigit2 (int&);
bool getInt (int&); bool getInt (int&);
bool getHex (int&);
bool getUnsignedInt (int&); bool getUnsignedInt (int&);
bool getNumber (std::string&); bool getNumber (std::string&);
bool getNumber (double&); bool getNumber (double&);

19
test/nibbler.t.cpp
View file

@ -40,15 +40,15 @@ int main (int argc, char** argv)
{ {
#ifdef NIBBLER_FEATURE_DATE #ifdef NIBBLER_FEATURE_DATE
#ifdef NIBBLER_FEATURE_REGEX #ifdef NIBBLER_FEATURE_REGEX
UnitTest t (417); UnitTest t (410);
#else #else
UnitTest t (387); UnitTest t (380);
#endif #endif
#else #else
#ifdef NIBBLER_FEATURE_REGEX #ifdef NIBBLER_FEATURE_REGEX
UnitTest t (353); UnitTest t (346);
#else #else
UnitTest t (329); UnitTest t (322);
#endif #endif
#endif #endif
@ -83,7 +83,6 @@ int main (int argc, char** argv)
t.notok (n.getQuoted ('"', s), "trivial: getQuoted"); t.notok (n.getQuoted ('"', s), "trivial: getQuoted");
t.notok (n.getDigit (i), "trivial: getDigit"); t.notok (n.getDigit (i), "trivial: getDigit");
t.notok (n.getInt (i), "trivial: getInt"); // 10 t.notok (n.getInt (i), "trivial: getInt"); // 10
t.notok (n.getHex (i), "trivial: getHex");
t.notok (n.getUnsignedInt (i), "trivial: getUnsignedInt"); t.notok (n.getUnsignedInt (i), "trivial: getUnsignedInt");
t.notok (n.getUntilEOL (s), "trivial: getUntilEOL"); t.notok (n.getUntilEOL (s), "trivial: getUntilEOL");
t.notok (n.getUntilEOS (s), "trivial: getUntilEOS"); t.notok (n.getUntilEOS (s), "trivial: getUntilEOS");
@ -301,16 +300,6 @@ int main (int argc, char** argv)
t.is (i, -4, " '-4' : getInt () -> '-4'"); t.is (i, -4, " '-4' : getInt () -> '-4'");
t.ok (n.depleted (), " '' : depleted () -> true"); t.ok (n.depleted (), " '' : depleted () -> true");
// bool getHex (int&);
t.diag ("Nibbler::getHex");
n = Nibbler ("123 7b");
t.ok (n.getHex (i), " '123 7b' : getHex () -> true");
t.is (i, 291, " '123 7b' : getHex () -> '291'");
t.ok (n.skip (' '), " ' 7b' : skip (' ') -> true");
t.ok (n.getHex (i), " '7b' : getHex () -> true");
t.is (i, 123, " '7b' : getHex () -> '123'");
t.ok (n.depleted (), " '' : depleted () -> true");
// bool getUnsignedInt (int&i); // bool getUnsignedInt (int&i);
t.diag ("Nibbler::getUnsignedInt"); t.diag ("Nibbler::getUnsignedInt");
n = Nibbler ("123 4"); n = Nibbler ("123 4");