Refactoring: Check types outside of AST and recover from some errors.

1 files changed, 59 insertions, 0 deletions

diff --git a/libsolidity/ConstantEvaluator.cpp b/libsolidity/ConstantEvaluator.cpp
new file mode 100644
index 00000000..5936b3d4
--- /dev/null
+++ b/libsolidity/ConstantEvaluator.cpp
@@ -0,0 +1,59 @@
+/*
+	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 2015
+ * Evaluator for types of constant expressions.
+ */
+
+#include <libsolidity/ConstantEvaluator.h>
+#include <libsolidity/AST.h>
+
+using namespace std;
+using namespace dev;
+using namespace dev::solidity;
+
+
+void ConstantEvaluator::endVisit(UnaryOperation const& _operation)
+{
+	TypePointer const& subType = _operation.subExpression().annotation().type;
+	if (!dynamic_cast<IntegerConstantType const*>(subType.get()))
+		BOOST_THROW_EXCEPTION(_operation.subExpression().createTypeError("Invalid constant expression."));
+	TypePointer t = subType->unaryOperatorResult(_operation.getOperator());
+	_operation.annotation().type = t;
+}
+
+void ConstantEvaluator::endVisit(BinaryOperation const& _operation)
+{
+	TypePointer const& leftType = _operation.leftExpression().annotation().type;
+	TypePointer const& rightType = _operation.rightExpression().annotation().type;
+	if (!dynamic_cast<IntegerConstantType const*>(leftType.get()))
+		BOOST_THROW_EXCEPTION(_operation.leftExpression().createTypeError("Invalid constant expression."));
+	if (!dynamic_cast<IntegerConstantType const*>(rightType.get()))
+		BOOST_THROW_EXCEPTION(_operation.rightExpression().createTypeError("Invalid constant expression."));
+	TypePointer commonType = leftType->binaryOperatorResult(_operation.getOperator(), rightType);
+	if (Token::isCompareOp(_operation.getOperator()))
+		commonType = make_shared<BoolType>();
+	_operation.annotation().type = commonType;
+}
+
+void ConstantEvaluator::endVisit(Literal const& _literal)
+{
+	_literal.annotation().type = Type::forLiteral(_literal);
+	if (!_literal.annotation().type)
+		BOOST_THROW_EXCEPTION(_literal.createTypeError("Invalid literal value."));
+}