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

Nibbler: Removed unused ::skipRx method

Browse source
This commit is contained in:
Paul Beckingham 2015-10-29 23:15:04 -04:00
parent ad26d98d0f
commit 180d3e75ff
3 changed files with 0 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/Nibbler.cpp
View file

@ -762,33 +762,6 @@ bool Nibbler::skipWS ()
return this->skipAllOneOf (" \t\n\r\f"); return this->skipAllOneOf (" \t\n\r\f");
} }
////////////////////////////////////////////////////////////////////////////////
#ifdef NIBBLER_FEATURE_REGEX
bool Nibbler::skipRx (const std::string& regex)
{
if (_cursor < _length)
{
// Regex may be anchored to the beginning and include capturing parentheses,
// otherwise they are added.
std::string modified_regex;
if (regex.substr (0, 2) != "^(")
modified_regex = "^(" + regex + ")";
else
modified_regex = regex;
RX r (modified_regex, true);
std::vector <std::string> results;
if (r.match (results, _input->substr (_cursor)))
{
_cursor += results[0].length ();
return true;
}
}
return false;
}
#endif
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
bool Nibbler::backN (const int quantity /*= 1*/) bool Nibbler::backN (const int quantity /*= 1*/)
{ {

3
src/Nibbler.h
View file

@ -80,9 +80,6 @@ public:
bool skipAll (char); bool skipAll (char);
bool skipAllOneOf (const std::string&); bool skipAllOneOf (const std::string&);
bool skipWS (); bool skipWS ();
#ifdef NIBBLER_FEATURE_REGEX
bool skipRx (const std::string&);
#endif
bool backN (const int quantity = 1); bool backN (const int quantity = 1);

11
test/nibbler.t.cpp
View file

@ -176,17 +176,6 @@ int main (int, char**)
t.is (s, "foo", " 'foo' : getUntilEOS () -> 'foo'"); t.is (s, "foo", " 'foo' : getUntilEOS () -> 'foo'");
t.ok (n.depleted (), " '' : depleted () -> true"); t.ok (n.depleted (), " '' : depleted () -> true");
#ifdef NIBBLER_FEATURE_REGEX
// bool skipRx (const std::string&);
t.diag ("Nibbler::skipRx");
n = Nibbler ("one two");
t.ok (n.skipRx ("o."), " 'one two' : skipRx ('o.') -> true");
t.notok (n.skipRx ("A+"), " 'e two' : skipRx ('A+') -> false");
t.ok (n.skipRx ("e+"), " 'e two' : skipRx ('e+') -> true");
t.ok (n.skipRx ("...."), " ' two' : skipRx ('....') -> true");
t.ok (n.depleted (), " '' : depleted () -> true");
#endif
// bool backN (const int quantity = 1); // bool backN (const int quantity = 1);
t.diag ("Nibbler::backN"); t.diag ("Nibbler::backN");
n = Nibbler ("/a/b/"); n = Nibbler ("/a/b/");