diff --git a/src/Nibbler.cpp b/src/Nibbler.cpp index a7516f206..3e4cc6ae1 100644 --- a/src/Nibbler.cpp +++ b/src/Nibbler.cpp @@ -153,12 +153,6 @@ bool Nibbler::getUntilWS (std::string& result) return this->getUntilOneOf (" \t\r\n\f", result); } -//////////////////////////////////////////////////////////////////////////////// -bool Nibbler::getUntilEOL (std::string& result) -{ - return getUntil ('\n', result); -} - //////////////////////////////////////////////////////////////////////////////// bool Nibbler::getUntilEOS (std::string& result) { diff --git a/src/Nibbler.h b/src/Nibbler.h index 4551d21d5..6e9f4b24f 100644 --- a/src/Nibbler.h +++ b/src/Nibbler.h @@ -45,7 +45,6 @@ public: bool getUntil (const std::string&, std::string&); bool getUntilOneOf (const std::string&, std::string&); bool getUntilWS (std::string&); - bool getUntilEOL (std::string&); bool getUntilEOS (std::string&); bool getN (const int, std::string&); diff --git a/test/nibbler.t.cpp b/test/nibbler.t.cpp index 754a8115f..37fe25af3 100644 --- a/test/nibbler.t.cpp +++ b/test/nibbler.t.cpp @@ -35,7 +35,7 @@ Context context; //////////////////////////////////////////////////////////////////////////////// int main (int, char**) { - UnitTest t (261); + UnitTest t (254); // Ensure environment has no influence. unsetenv ("TASKDATA"); @@ -64,7 +64,6 @@ int main (int, char**) t.notok (n.getDigit (i), "trivial: getDigit"); t.notok (n.getInt (i), "trivial: getInt"); // 10 t.notok (n.getUnsignedInt (i), "trivial: getUnsignedInt"); - t.notok (n.getUntilEOL (s), "trivial: getUntilEOL"); t.notok (n.getUntilEOS (s), "trivial: getUntilEOS"); t.notok (n.getOneOf (options, s), "trivial: getOneOf"); t.ok (n.depleted (), "trivial: depleted"); @@ -456,16 +455,6 @@ int main (int, char**) t.is (s, "3", " '3' : getN (1) -> '1'"); t.ok (n.depleted (), " '' : depleted () -> true"); - // bool getUntilEOL (std::string&); - t.diag ("Nibbler::getUntilEOL"); - n = Nibbler ("one\ntwo"); - t.ok (n.getUntilEOL (s), "'one\\ntwo' : getUntilEOL () -> true"); - t.is (s, "one", "'one\\ntwo' : getUntilEOL () -> 'one'"); - t.ok (n.skip ('\n'), " '\\ntwo' : skip ('\\n') -> true"); - t.ok (n.getUntilEOL (s), " 'two' : getUntilEOL () -> true"); - t.is (s, "two", " 'two' : getUntilEOL () -> 'two'"); - t.ok (n.depleted (), " '' : depleted () -> true"); - // bool getUntilEOS (std::string&); t.diag ("Nibbler::getUntilEOS"); n = Nibbler ("one two");