diff --git a/src/Nibbler.cpp b/src/Nibbler.cpp index cfd2291f9..237910f39 100644 --- a/src/Nibbler.cpp +++ b/src/Nibbler.cpp @@ -131,33 +131,6 @@ bool Nibbler::getUntil (const std::string& terminator, std::string& result) return false; } -//////////////////////////////////////////////////////////////////////////////// -#ifdef NIBBLER_FEATURE_REGEX -bool Nibbler::getUntilRx (const std::string& regex, std::string& result) -{ - if (_cursor < _length) - { - RX r (regex, true); - std::vector start; - std::vector end; - if (r.match (start, end, _input->substr (_cursor))) - { - result = _input->substr (_cursor, start[0]); - _cursor += start[0]; - } - else - { - result = _input->substr (_cursor); - _cursor = _length; - } - - return true; - } - - return false; -} -#endif - //////////////////////////////////////////////////////////////////////////////// bool Nibbler::getUntilOneOf (const std::string& chars, std::string& result) { diff --git a/src/Nibbler.h b/src/Nibbler.h index 6be76976f..2c1eb1f1b 100644 --- a/src/Nibbler.h +++ b/src/Nibbler.h @@ -46,9 +46,6 @@ public: bool getUntil (char, std::string&); bool getUntil (const std::string&, std::string&); -#ifdef NIBBLER_FEATURE_REGEX - bool getUntilRx (const std::string&, std::string&); -#endif bool getUntilOneOf (const std::string&, std::string&); bool getUntilWS (std::string&); bool getUntilEOL (std::string&); diff --git a/test/nibbler.t.cpp b/test/nibbler.t.cpp index 6fa1d3da2..daead254d 100644 --- a/test/nibbler.t.cpp +++ b/test/nibbler.t.cpp @@ -36,7 +36,7 @@ Context context; int main (int, char**) { #ifdef NIBBLER_FEATURE_REGEX - UnitTest t (339); + UnitTest t (325); #else UnitTest t (315); #endif @@ -85,23 +85,6 @@ int main (int, char**) t.notok (n.getUntil (' ', s), " '' : getUntil (' ') -> false"); t.ok (n.depleted (), " '' : depleted () -> true"); -#ifdef NIBBLER_FEATURE_REGEX - // bool getUntilRx (const std::string&, std::string&); - t.diag ("Nibbler::getUntilRx"); - n = Nibbler ("one two"); - t.ok (n.getUntilRx ("th", s), " 'one two' : getUntilRx ('th') -> true"); - t.is (s, "one two", " 'one two' : getUntilRx ('th') -> 'one two'"); - - n = Nibbler ("one two"); - t.ok (n.getUntilRx ("e", s), " 'one two' : getUntilRx ('e') -> true"); - t.is (s, "on", " 'one two' : getUntilRx ('e') -> 'on'"); // 30 - t.ok (n.getUntilRx ("tw", s), " 'e two' : getUntilRx ('tw') -> true"); - t.is (s, "e ", " 'e two' : getUntilRx ('tw') -> 'e '"); - t.ok (n.getUntilRx ("$", s), " 'two' : getUntilRx ('$') -> true"); - t.is (s, "two", " 'two' : getUntilRx ('$') -> 'two'"); - t.ok (n.depleted (), " '' : depleted () -> true"); -#endif - // bool getUntilOneOf (const std::string&, std::string&); t.diag ("Nibbler::getUntilOneOf"); n = Nibbler ("ab.cd");