util: Migrated nontrivial from text

This commit is contained in:
Paul Beckingham 2016-12-11 17:34:50 -05:00
parent a7d90fa1fa
commit 0027c9face
7 changed files with 27 additions and 27 deletions

View file

@ -44,7 +44,7 @@
#include <Timer.h>
#include <format.h>
#include <shared.h>
#include <text.h>
#include <util.h>
#include <i18n.h>
extern Context context;

View file

@ -52,18 +52,6 @@ const char* optionalBlankLine ()
return context.verbose ("blank") ? newline : noline;
}
////////////////////////////////////////////////////////////////////////////////
bool nontrivial (const std::string& input)
{
std::string::size_type i = 0;
int character;
while ((character = utf8_next_char (input, i)))
if (! Lexer::isWhitespace (character))
return true;
return false;
}
////////////////////////////////////////////////////////////////////////////////
// Return the length, in characters, of the input, subtracting color control
// codes.

View file

@ -34,7 +34,6 @@
// text.cpp, Non-UTF-8 aware.
const char* optionalBlankLine ();
bool nontrivial (const std::string&);
int strippedLength (const std::string&);
#endif

View file

@ -316,3 +316,15 @@ const std::string obfuscateText (const std::string& input)
}
////////////////////////////////////////////////////////////////////////////////
bool nontrivial (const std::string& input)
{
std::string::size_type i = 0;
int character;
while ((character = utf8_next_char (input, i)))
if (! Lexer::isWhitespace (character))
return true;
return false;
}
////////////////////////////////////////////////////////////////////////////////

View file

@ -62,6 +62,7 @@ const std::vector <std::string> extractParents (
std::string osName ();
const std::string obfuscateText (const std::string&);
bool nontrivial (const std::string&);
#endif
////////////////////////////////////////////////////////////////////////////////