Small cleanup.

1 files changed, 9 insertions, 11 deletions

diff --git a/AST.cpp b/AST.cpp
index 6f5b1f38..ab9dccf6 100644
--- a/AST.cpp
+++ b/AST.cpp
@@ -478,7 +478,7 @@ void FunctionCall::checkTypeRequirements()
 		if (m_arguments.size() != 1)
 			BOOST_THROW_EXCEPTION(createTypeError("More than one argument for explicit type conversion."));
 		if (!m_names.empty())
-			BOOST_THROW_EXCEPTION(createTypeError("Type conversion can't allow named arguments."));
+			BOOST_THROW_EXCEPTION(createTypeError("Type conversion cannot allow named arguments."));
 		if (!m_arguments.front()->getType()->isExplicitlyConvertibleTo(*type.getActualType()))
 			BOOST_THROW_EXCEPTION(createTypeError("Explicit type conversion not allowed."));
 		m_type = type.getActualType();
@@ -496,24 +496,22 @@ void FunctionCall::checkTypeRequirements()
 		{
 			for (size_t i = 0; i < m_arguments.size(); ++i)
 				if (functionType->getLocation() != FunctionType::Location::SHA3 &&
-					!m_arguments[i]->getType()->isImplicitlyConvertibleTo(*parameterTypes[i]))
-					BOOST_THROW_EXCEPTION(createTypeError("Invalid type for argument in function call."));
+						!m_arguments[i]->getType()->isImplicitlyConvertibleTo(*parameterTypes[i]))
+					BOOST_THROW_EXCEPTION(m_arguments[i]->createTypeError("Invalid type for argument in function call."));
 		}
-		else if (functionType->getLocation() == FunctionType::Location::SHA3)
-			BOOST_THROW_EXCEPTION(createTypeError("Named arguments can't be used for SHA3."));
 		else
 		{
+			if (functionType->getLocation() == FunctionType::Location::SHA3)
+				BOOST_THROW_EXCEPTION(createTypeError("Named arguments cannnot be used for SHA3."));
 			auto const& parameterNames = functionType->getParameterNames();
 			if (parameterNames.size() != m_names.size())
 				BOOST_THROW_EXCEPTION(createTypeError("Some argument names are missing."));
 
 			// check duplicate names
-			for (size_t i = 0; i < m_names.size(); i++) {
-				for (size_t j = i + 1; j < m_names.size(); j++) {
+			for (size_t i = 0; i < m_names.size(); i++)
+				for (size_t j = i + 1; j < m_names.size(); j++)
 					if (*m_names[i] == *m_names[j])
-						BOOST_THROW_EXCEPTION(createTypeError("Duplicate named argument."));
-				}
-			}
+						BOOST_THROW_EXCEPTION(m_arguments[i]->createTypeError("Duplicate named argument."));
 
 			for (size_t i = 0; i < m_names.size(); i++) {
 				bool found = false;
@@ -528,7 +526,7 @@ void FunctionCall::checkTypeRequirements()
 					}
 				}
 				if (!found)
-					BOOST_THROW_EXCEPTION(createTypeError("Named argument doesn't match function declaration."));
+					BOOST_THROW_EXCEPTION(createTypeError("Named argument does not match function declaration."));
 			}
 		}