Rename dev::validate to dev::validateUTF8

This commit is contained in:
Alex Beregszaszi 2016-11-28 22:07:55 +00:00
parent c01426efec
commit a9e92cb686
4 changed files with 7 additions and 7 deletions

View File

@ -28,7 +28,7 @@ namespace dev
{
bool validate(std::string const& _input, size_t& _invalidPosition)
bool validateUTF8(std::string const& _input, size_t& _invalidPosition)
{
const size_t length = _input.length();
bool valid = true;

View File

@ -30,12 +30,12 @@ namespace dev
/// Validate an input for UTF8 encoding
/// @returns false if it is invalid and the first invalid position in invalidPosition
bool validate(std::string const& _input, size_t& _invalidPosition);
bool validateUTF8(std::string const& _input, size_t& _invalidPosition);
inline bool validate(std::string const& _input)
inline bool validateUTF8(std::string const& _input)
{
size_t invalidPos;
return validate(_input, invalidPos);
return validateUTF8(_input, invalidPos);
}
}

View File

@ -418,7 +418,7 @@ bool ASTJsonConverter::visit(Literal const& _node)
{
char const* tokenString = Token::toString(_node.token());
Json::Value value{_node.value()};
if (!dev::validate(_node.value()))
if (!dev::validateUTF8(_node.value()))
value = Json::nullValue;
Token::Value subdenomination = Token::Value(_node.subDenomination());
addJsonNode(_node, "Literal", {

View File

@ -896,7 +896,7 @@ std::string StringLiteralType::toString(bool) const
{
size_t invalidSequence;
if (!dev::validate(m_value, invalidSequence))
if (!dev::validateUTF8(m_value, invalidSequence))
return "literal_string (contains invalid UTF-8 sequence at position " + dev::toString(invalidSequence) + ")";
return "literal_string \"" + m_value + "\"";
@ -909,7 +909,7 @@ TypePointer StringLiteralType::mobileType() const
bool StringLiteralType::isValidUTF8() const
{
return dev::validate(m_value);
return dev::validateUTF8(m_value);
}
shared_ptr<FixedBytesType> FixedBytesType::smallestTypeForLiteral(string const& _literal)