diff options
| author | chriseth <chris@ethereum.org> | 2018-09-11 21:29:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-11 21:29:53 +0800 |
| commit | 1994b51ef3eb8de3617efec9747979c9fb5ed453 (patch) | |
| tree | 258433cfc4c6fced543ba9cf968995e09438c851 /libsolidity/ast | |
| parent | 7d5c13981623f5f931444d227b163d9b0d995fd8 (diff) | |
| parent | 1ce3581a522a94d9e9a4a84cf8cb63f626e1a14f (diff) | |
| download | dexon-solidity-1994b51ef3eb8de3617efec9747979c9fb5ed453.tar dexon-solidity-1994b51ef3eb8de3617efec9747979c9fb5ed453.tar.gz dexon-solidity-1994b51ef3eb8de3617efec9747979c9fb5ed453.tar.bz2 dexon-solidity-1994b51ef3eb8de3617efec9747979c9fb5ed453.tar.lz dexon-solidity-1994b51ef3eb8de3617efec9747979c9fb5ed453.tar.xz dexon-solidity-1994b51ef3eb8de3617efec9747979c9fb5ed453.tar.zst dexon-solidity-1994b51ef3eb8de3617efec9747979c9fb5ed453.zip | |
Merge pull request #4926 from ethereum/addressPayableParser
Accept ``address payable`` during parsing.
Diffstat (limited to 'libsolidity/ast')
| -rw-r--r-- | libsolidity/ast/AST.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h index a5cd277d..f3464f92 100644 --- a/libsolidity/ast/AST.h +++ b/libsolidity/ast/AST.h @@ -876,23 +876,31 @@ public: }; /** - * Any pre-defined type name represented by a single keyword, i.e. it excludes mappings, - * contracts, functions, etc. + * Any pre-defined type name represented by a single keyword (and possibly a state mutability for address types), + * i.e. it excludes mappings, contracts, functions, etc. */ class ElementaryTypeName: public TypeName { public: - ElementaryTypeName(SourceLocation const& _location, ElementaryTypeNameToken const& _elem): - TypeName(_location), m_type(_elem) - {} + ElementaryTypeName( + SourceLocation const& _location, + ElementaryTypeNameToken const& _elem, + boost::optional<StateMutability> _stateMutability = {} + ): TypeName(_location), m_type(_elem), m_stateMutability(_stateMutability) + { + solAssert(!_stateMutability.is_initialized() || _elem.token() == Token::Address, ""); + } virtual void accept(ASTVisitor& _visitor) override; virtual void accept(ASTConstVisitor& _visitor) const override; ElementaryTypeNameToken const& typeName() const { return m_type; } + boost::optional<StateMutability> const& stateMutability() const { return m_stateMutability; } + private: ElementaryTypeNameToken m_type; + boost::optional<StateMutability> m_stateMutability; ///< state mutability for address type }; /** |