From 767ec1d670808cd479ac74780bff51a1f1900f04 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 1 Dec 2016 12:12:10 +0000 Subject: Support explicit conversion of external function type to address --- libsolidity/ast/Types.cpp | 11 +++++++++++ libsolidity/ast/Types.h | 1 + 2 files changed, 12 insertions(+) (limited to 'libsolidity/ast') diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp index dbabc8db..4a64b4c8 100644 --- a/libsolidity/ast/Types.cpp +++ b/libsolidity/ast/Types.cpp @@ -2158,6 +2158,17 @@ bool FunctionType::operator==(Type const& _other) const return true; } +bool FunctionType::isExplicitlyConvertibleTo(Type const& _convertTo) const +{ + if (m_location == Location::External && _convertTo.category() == Category::Integer) + { + IntegerType const& convertTo = dynamic_cast(_convertTo); + if (convertTo.isAddress()) + return true; + } + return _convertTo.category() == category(); +} + TypePointer FunctionType::unaryOperatorResult(Token::Value _operator) const { if (_operator == Token::Value::Delete) diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h index a5147f17..3917dca2 100644 --- a/libsolidity/ast/Types.h +++ b/libsolidity/ast/Types.h @@ -922,6 +922,7 @@ public: virtual std::string identifier() const override; virtual bool operator==(Type const& _other) const override; + virtual bool isExplicitlyConvertibleTo(Type const& _convertTo) const override; virtual TypePointer unaryOperatorResult(Token::Value _operator) const override; virtual std::string canonicalName(bool /*_addDataLocation*/) const override; virtual std::string toString(bool _short) const override; -- cgit