From 297f2b6e99e26bcf0d38482150c35fad17758d0b Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Thu, 29 Oct 2015 23:53:17 -0400 Subject: [PATCH] Nibbler: Removed unused ::skipAll method --- src/Nibbler.cpp | 20 -------------------- src/Nibbler.h | 1 - test/nibbler.t.cpp | 12 +----------- 3 files changed, 1 insertion(+), 32 deletions(-) diff --git a/src/Nibbler.cpp b/src/Nibbler.cpp index 42f1736ea..ff58d5602 100644 --- a/src/Nibbler.cpp +++ b/src/Nibbler.cpp @@ -532,26 +532,6 @@ bool Nibbler::skip (char c) return false; } -//////////////////////////////////////////////////////////////////////////////// -bool Nibbler::skipAll (char c) -{ - if (_cursor < _length) - { - auto i = _input->find_first_not_of (c, _cursor); - if (i == _cursor) - return false; - - if (i == std::string::npos) - _cursor = _length; // Yes, off the end. - else - _cursor = i; - - return true; - } - - return false; -} - //////////////////////////////////////////////////////////////////////////////// bool Nibbler::skipWS () { diff --git a/src/Nibbler.h b/src/Nibbler.h index 7422a2ffa..5493e7f1f 100644 --- a/src/Nibbler.h +++ b/src/Nibbler.h @@ -63,7 +63,6 @@ public: bool skipN (const int quantity = 1); bool skip (char); - bool skipAll (char); bool skipAllOneOf (const std::string&); bool skipWS (); diff --git a/test/nibbler.t.cpp b/test/nibbler.t.cpp index c95732280..897ecd1a0 100644 --- a/test/nibbler.t.cpp +++ b/test/nibbler.t.cpp @@ -35,7 +35,7 @@ Context context; //////////////////////////////////////////////////////////////////////////////// int main (int, char**) { - UnitTest t (252); + UnitTest t (246); // Ensure environment has no influence. unsetenv ("TASKDATA"); @@ -57,7 +57,6 @@ int main (int, char**) t.notok (n.getUntilOneOf ("ab", s), "trivial: getUntilOneOf"); t.notok (n.skipN (123), "trivial: skipN"); t.notok (n.skip ('x'), "trivial: skip"); - t.notok (n.skipAll ('x'), "trivial: skipAll"); t.notok (n.skipAllOneOf ("abc"), "trivial: skipAllOneOf"); t.notok (n.backN (1), "trivial: backN"); t.notok (n.getQuoted ('"', s), "trivial: getQuoted"); @@ -128,15 +127,6 @@ int main (int, char**) t.ok (n.skip ('a'), " 'a' : skip ('a') -> true"); t.ok (n.depleted (), " '' : depleted () -> true"); - // bool skipAll (char); - t.diag ("Nibbler::skipAll"); - n = Nibbler ("aaaabb"); - t.ok (n.skipAll ('a'), " 'aaaabb' : skipAll ('a') -> true"); - t.notok (n.skipAll ('a'), " 'bb' : skipAll ('a') -> false"); - t.ok (n.skipAll ('b'), " 'bb' : skipAll ('b') -> true"); - t.notok (n.skipAll ('b'), " '' : skipAll ('b') -> false"); - t.ok (n.depleted (), " '' : depleted () -> true"); - // bool skipAllOneOf (const std::string&); t.diag ("Nibbler::skipAllOneOf"); n = Nibbler ("abababcc");