Make position optional in dev::validate

dbulnes · Nov 28, 2016 · c01426e · c01426e
1 parent dadb481
commit c01426e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/libdevcore/UTF8.h b/libdevcore/UTF8.h
@@ -32,4 +32,10 @@ namespace dev
 /// @returns false if it is invalid and the first invalid position in invalidPosition
 bool validate(std::string const& _input, size_t& _invalidPosition);
 
+inline bool validate(std::string const& _input)
+{
+	size_t invalidPos;
+	return validate(_input, invalidPos);
+}
+
 }
diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp
@@ -417,9 +417,8 @@ bool ASTJsonConverter::visit(ElementaryTypeNameExpression const& _node)
 bool ASTJsonConverter::visit(Literal const& _node)
 {
 	char const* tokenString = Token::toString(_node.token());
-	size_t invalidPos = 0;
 	Json::Value value{_node.value()};
-	if (!dev::validate(_node.value(), invalidPos))
+	if (!dev::validate(_node.value()))
 		value = Json::nullValue;
 	Token::Value subdenomination = Token::Value(_node.subDenomination());
 	addJsonNode(_node, "Literal", {

diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
@@ -909,8 +909,7 @@ TypePointer StringLiteralType::mobileType() const
 
 bool StringLiteralType::isValidUTF8() const
 {
-	size_t dontCare {};
-	return dev::validate(m_value, dontCare);
+	return dev::validate(m_value);
 }
 
 shared_ptr<FixedBytesType> FixedBytesType::smallestTypeForLiteral(string const& _literal)