Improved exceptions and reporting exceptions for command-line compiler.

This commit is contained in:
Christian 2014-10-16 17:56:10 +02:00
parent fd046d7c90
commit 781d7fd514
6 changed files with 111 additions and 38 deletions

37
AST.cpp
View File

@ -252,8 +252,8 @@ void Statement::expectType(Expression& _expression, const Type& _expectedType)
{ {
_expression.checkTypeRequirements(); _expression.checkTypeRequirements();
if (!_expression.getType()->isImplicitlyConvertibleTo(_expectedType)) if (!_expression.getType()->isImplicitlyConvertibleTo(_expectedType))
BOOST_THROW_EXCEPTION(TypeError() << errinfo_comment("Type not implicitly convertible " BOOST_THROW_EXCEPTION(TypeError(_expression.getLocation(),
"to expected type.")); "Type not implicitly convertible to expected type."));
//@todo provide more information to the exception //@todo provide more information to the exception
} }
@ -289,9 +289,9 @@ void Return::checkTypeRequirements()
{ {
BOOST_ASSERT(m_returnParameters != nullptr); BOOST_ASSERT(m_returnParameters != nullptr);
if (m_returnParameters->getParameters().size() != 1) if (m_returnParameters->getParameters().size() != 1)
BOOST_THROW_EXCEPTION(TypeError() << errinfo_comment("Different number of arguments in " BOOST_THROW_EXCEPTION(TypeError(getLocation(), "Different number of arguments in "
"return statement than in returns " "return statement than in returns "
"declaration.")); "declaration."));
// this could later be changed such that the paramaters type is an anonymous struct type, // this could later be changed such that the paramaters type is an anonymous struct type,
// but for now, we only allow one return parameter // but for now, we only allow one return parameter
expectType(*m_expression, *m_returnParameters->getParameters().front()->getType()); expectType(*m_expression, *m_returnParameters->getParameters().front()->getType());
@ -327,7 +327,7 @@ void Assignment::checkTypeRequirements()
{ {
// complex assignment // complex assignment
if (!m_type->acceptsBinaryOperator(Token::AssignmentToBinaryOp(m_assigmentOperator))) if (!m_type->acceptsBinaryOperator(Token::AssignmentToBinaryOp(m_assigmentOperator)))
BOOST_THROW_EXCEPTION(TypeError() << errinfo_comment("Operator not compatible with type.")); BOOST_THROW_EXCEPTION(TypeError(getLocation(), "Operator not compatible with type."));
} }
} }
@ -337,7 +337,7 @@ void UnaryOperation::checkTypeRequirements()
m_subExpression->checkTypeRequirements(); m_subExpression->checkTypeRequirements();
m_type = m_subExpression->getType(); m_type = m_subExpression->getType();
if (m_type->acceptsUnaryOperator(m_operator)) if (m_type->acceptsUnaryOperator(m_operator))
BOOST_THROW_EXCEPTION(TypeError() << errinfo_comment("Unary operator not compatible with type.")); BOOST_THROW_EXCEPTION(TypeError(getLocation(), "Unary operator not compatible with type."));
} }
void BinaryOperation::checkTypeRequirements() void BinaryOperation::checkTypeRequirements()
@ -349,7 +349,7 @@ void BinaryOperation::checkTypeRequirements()
else if (m_left->getType()->isImplicitlyConvertibleTo(*m_right->getType())) else if (m_left->getType()->isImplicitlyConvertibleTo(*m_right->getType()))
m_commonType = m_right->getType(); m_commonType = m_right->getType();
else else
BOOST_THROW_EXCEPTION(TypeError() << errinfo_comment("No common type found in binary operation.")); BOOST_THROW_EXCEPTION(TypeError(getLocation(), "No common type found in binary operation."));
if (Token::isCompareOp(m_operator)) if (Token::isCompareOp(m_operator))
m_type = std::make_shared<BoolType>(); m_type = std::make_shared<BoolType>();
else else
@ -357,7 +357,7 @@ void BinaryOperation::checkTypeRequirements()
BOOST_ASSERT(Token::isBinaryOp(m_operator)); BOOST_ASSERT(Token::isBinaryOp(m_operator));
m_type = m_commonType; m_type = m_commonType;
if (!m_commonType->acceptsBinaryOperator(m_operator)) if (!m_commonType->acceptsBinaryOperator(m_operator))
BOOST_THROW_EXCEPTION(TypeError() << errinfo_comment("Operator not compatible with type.")); BOOST_THROW_EXCEPTION(TypeError(getLocation(), "Operator not compatible with type."));
} }
} }
@ -375,11 +375,10 @@ void FunctionCall::checkTypeRequirements()
//@todo for structs, we have to check the number of arguments to be equal to the //@todo for structs, we have to check the number of arguments to be equal to the
// number of non-mapping members // number of non-mapping members
if (m_arguments.size() != 1) if (m_arguments.size() != 1)
BOOST_THROW_EXCEPTION(TypeError() << errinfo_comment("More than one argument for " BOOST_THROW_EXCEPTION(TypeError(getLocation(), "More than one argument for "
"explicit type conersion.")); "explicit type conersion."));
if (!m_arguments.front()->getType()->isExplicitlyConvertibleTo(*type->getActualType())) if (!m_arguments.front()->getType()->isExplicitlyConvertibleTo(*type->getActualType()))
BOOST_THROW_EXCEPTION(TypeError() << errinfo_comment("Explicit type conversion not " BOOST_THROW_EXCEPTION(TypeError(getLocation(), "Explicit type conversion not allowed."));
"allowed."));
m_type = type->getActualType(); m_type = type->getActualType();
} }
else if (category == Type::Category::FUNCTION) else if (category == Type::Category::FUNCTION)
@ -392,12 +391,10 @@ void FunctionCall::checkTypeRequirements()
FunctionDefinition const& fun = function->getFunction(); FunctionDefinition const& fun = function->getFunction();
std::vector<ASTPointer<VariableDeclaration>> const& parameters = fun.getParameters(); std::vector<ASTPointer<VariableDeclaration>> const& parameters = fun.getParameters();
if (parameters.size() != m_arguments.size()) if (parameters.size() != m_arguments.size())
BOOST_THROW_EXCEPTION(TypeError() << errinfo_comment("Wrong argument count for " BOOST_THROW_EXCEPTION(TypeError(getLocation(), "Wrong argument count for function call."));
"function call."));
for (size_t i = 0; i < m_arguments.size(); ++i) for (size_t i = 0; i < m_arguments.size(); ++i)
if (!m_arguments[i]->getType()->isImplicitlyConvertibleTo(*parameters[i]->getType())) if (!m_arguments[i]->getType()->isImplicitlyConvertibleTo(*parameters[i]->getType()))
BOOST_THROW_EXCEPTION(TypeError() << errinfo_comment("Invalid type for argument in " BOOST_THROW_EXCEPTION(TypeError(getLocation(), "Invalid type for argument in function call."));
"function call."));
// @todo actually the return type should be an anonymous struct, // @todo actually the return type should be an anonymous struct,
// but we change it to the type of the first return value until we have structs // but we change it to the type of the first return value until we have structs
if (fun.getReturnParameterList()->getParameters().empty()) if (fun.getReturnParameterList()->getParameters().empty())
@ -407,7 +404,7 @@ void FunctionCall::checkTypeRequirements()
} }
else else
{ {
BOOST_THROW_EXCEPTION(TypeError() << errinfo_comment("Type does not support invocation.")); BOOST_THROW_EXCEPTION(TypeError(getLocation(), "Type does not support invocation."));
} }
} }
@ -438,8 +435,8 @@ void Identifier::checkTypeRequirements()
if (variable != nullptr) if (variable != nullptr)
{ {
if (!variable->getType()) if (!variable->getType())
BOOST_THROW_EXCEPTION(TypeError() << errinfo_comment("Variable referenced before type " BOOST_THROW_EXCEPTION(TypeError(getLocation(), "Variable referenced before type "
"could be determined.")); "could be determined."));
m_type = variable->getType(); m_type = variable->getType();
return; return;
} }

47
Exceptions.cpp Normal file
View File

@ -0,0 +1,47 @@
/*
This file is part of cpp-ethereum.
cpp-ethereum is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
cpp-ethereum is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @author Christian <c@ethdev.com>
* @date 2014
* Solidity exception hierarchy.
*/
#include <libsolidity/Exceptions.h>
namespace dev
{
namespace solidity
{
const char* ParserError::what() const noexcept
{
ETH_RETURN_STRING("Parser error: " + m_description);
}
const char* DeclarationError::what() const noexcept
{
ETH_RETURN_STRING("Declaration error: " + m_description);
}
const char* TypeError::what() const noexcept
{
ETH_RETURN_STRING("Type error: " + m_description);
}
}
}

View File

@ -22,16 +22,53 @@
#pragma once #pragma once
#include <string>
#include <libdevcore/Exceptions.h> #include <libdevcore/Exceptions.h>
#include <libsolidity/BaseTypes.h>
namespace dev namespace dev
{ {
namespace solidity namespace solidity
{ {
struct ParserError: virtual Exception {}; class ParserError: public virtual Exception
struct TypeError: virtual Exception {}; {
struct DeclarationError: virtual Exception {}; public:
ParserError(int _position, std::string const& _description):
m_position(_position), m_description(_description) {}
virtual const char* what() const noexcept;
int getPosition() const { return m_position; }
private:
int m_position;
std::string m_description;
};
class TypeError: public virtual Exception
{
public:
TypeError(Location const& _location, std::string const& _description):
m_location(_location), m_description(_description) {}
virtual const char* what() const noexcept;
Location const& getLocation() const { return m_location; }
private:
Location m_location;
std::string m_description;
};
class DeclarationError: public virtual Exception
{
public:
DeclarationError(Location const& _location, std::string const& _description):
m_location(_location), m_description(_description) {}
virtual const char* what() const noexcept;
Location const& getLocation() const { return m_location; }
private:
Location m_location;
std::string m_description;
};
} }
} }

View File

@ -137,7 +137,8 @@ void DeclarationRegistrationHelper::registerDeclaration(Declaration& _declaratio
{ {
BOOST_ASSERT(m_currentScope != nullptr); BOOST_ASSERT(m_currentScope != nullptr);
if (!m_currentScope->registerDeclaration(_declaration)) if (!m_currentScope->registerDeclaration(_declaration))
BOOST_THROW_EXCEPTION(DeclarationError() << errinfo_comment("Identifier already declared.")); BOOST_THROW_EXCEPTION(DeclarationError(_declaration.getLocation(), "Identifier already declared."));
//@todo the exception should also contain the location of the first declaration
if (_opensScope) if (_opensScope)
enterNewSubScope(_declaration); enterNewSubScope(_declaration);
} }
@ -175,11 +176,11 @@ bool ReferencesResolver::visit(UserDefinedTypeName& _typeName)
{ {
Declaration* declaration = m_resolver.getNameFromCurrentScope(_typeName.getName()); Declaration* declaration = m_resolver.getNameFromCurrentScope(_typeName.getName());
if (declaration == nullptr) if (declaration == nullptr)
BOOST_THROW_EXCEPTION(DeclarationError() << errinfo_comment("Undeclared identifier.")); BOOST_THROW_EXCEPTION(DeclarationError(_typeName.getLocation(), "Undeclared identifier."));
StructDefinition* referencedStruct = dynamic_cast<StructDefinition*>(declaration); StructDefinition* referencedStruct = dynamic_cast<StructDefinition*>(declaration);
//@todo later, contracts are also valid types //@todo later, contracts are also valid types
if (referencedStruct == nullptr) if (referencedStruct == nullptr)
BOOST_THROW_EXCEPTION(TypeError() << errinfo_comment("Identifier does not name a type name.")); BOOST_THROW_EXCEPTION(TypeError(_typeName.getLocation(), "Identifier does not name a type name."));
_typeName.setReferencedStruct(*referencedStruct); _typeName.setReferencedStruct(*referencedStruct);
return false; return false;
} }
@ -188,7 +189,7 @@ bool ReferencesResolver::visit(Identifier& _identifier)
{ {
Declaration* declaration = m_resolver.getNameFromCurrentScope(_identifier.getName()); Declaration* declaration = m_resolver.getNameFromCurrentScope(_identifier.getName());
if (declaration == nullptr) if (declaration == nullptr)
BOOST_THROW_EXCEPTION(DeclarationError() << errinfo_comment("Undeclared identifier.")); BOOST_THROW_EXCEPTION(DeclarationError(_identifier.getLocation(), "Undeclared identifier."));
_identifier.setReferencedDeclaration(*declaration); _identifier.setReferencedDeclaration(*declaration);
return false; return false;
} }

View File

@ -536,16 +536,7 @@ ASTPointer<ASTString> Parser::getLiteralAndAdvance()
void Parser::throwExpectationError(std::string const& _description) void Parser::throwExpectationError(std::string const& _description)
{ {
//@todo put some of this stuff into ParserError BOOST_THROW_EXCEPTION(ParserError(getPosition(), _description));
int line, column;
std::tie(line, column) = m_scanner->translatePositionToLineColumn(getPosition());
std::stringstream buf;
buf << "Solidity parser error: " << _description
<< " at line " << (line + 1)
<< ", column " << (column + 1) << "\n"
<< m_scanner->getLineAtPosition(getPosition()) << "\n"
<< std::string(column, ' ') << "^";
BOOST_THROW_EXCEPTION(ParserError() << errinfo_comment(buf.str()));
} }

View File

@ -88,9 +88,9 @@ std::shared_ptr<IntegerType> IntegerType::smallestTypeForLiteral(std::string con
IntegerType::IntegerType(int _bits, IntegerType::Modifier _modifier): IntegerType::IntegerType(int _bits, IntegerType::Modifier _modifier):
m_bits(_bits), m_modifier(_modifier) m_bits(_bits), m_modifier(_modifier)
{ {
BOOST_ASSERT(_bits > 0 && _bits <= 256 && _bits % 8 == 0);
if (isAddress()) if (isAddress())
_bits = 160; _bits = 160;
BOOST_ASSERT(_bits > 0 && _bits <= 256 && _bits % 8 == 0);
} }
bool IntegerType::isImplicitlyConvertibleTo(Type const& _convertTo) const bool IntegerType::isImplicitlyConvertibleTo(Type const& _convertTo) const