diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2019-01-18 19:36:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-18 19:36:49 +0800 |
| commit | 7b759866cbcde44915760a416d3e9f78f465adf2 (patch) | |
| tree | 56887a5873c343602ee7ba48f5bd782ada730b43 /libsolidity/ast | |
| parent | 2ec997e697e306dd54165aad365406ee88c534cb (diff) | |
| parent | b7a86a124d658f0723f576e0f447773f3bec148b (diff) | |
| download | dexon-solidity-7b759866cbcde44915760a416d3e9f78f465adf2.tar dexon-solidity-7b759866cbcde44915760a416d3e9f78f465adf2.tar.gz dexon-solidity-7b759866cbcde44915760a416d3e9f78f465adf2.tar.bz2 dexon-solidity-7b759866cbcde44915760a416d3e9f78f465adf2.tar.lz dexon-solidity-7b759866cbcde44915760a416d3e9f78f465adf2.tar.xz dexon-solidity-7b759866cbcde44915760a416d3e9f78f465adf2.tar.zst dexon-solidity-7b759866cbcde44915760a416d3e9f78f465adf2.zip | |
Merge pull request #5817 from ethereum/refactoring
Refactoring in TypeChecker and ContractDefinition
Diffstat (limited to 'libsolidity/ast')
| -rw-r--r-- | libsolidity/ast/AST.h | 1 | ||||
| -rw-r--r-- | libsolidity/ast/Types.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h index cd986050..f6fdc441 100644 --- a/libsolidity/ast/AST.h +++ b/libsolidity/ast/AST.h @@ -394,6 +394,7 @@ public: std::vector<FunctionDefinition const*> definedFunctions() const { return filteredNodes<FunctionDefinition>(m_subNodes); } std::vector<EventDefinition const*> events() const { return filteredNodes<EventDefinition>(m_subNodes); } std::vector<EventDefinition const*> const& interfaceEvents() const; + bool isInterface() const { return m_contractKind == ContractKind::Interface; } bool isLibrary() const { return m_contractKind == ContractKind::Library; } /// @returns a map of canonical function signatures to FunctionDefinitions diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp index 081c7fb6..3a8c9878 100644 --- a/libsolidity/ast/Types.cpp +++ b/libsolidity/ast/Types.cpp @@ -2525,7 +2525,7 @@ FunctionTypePointer FunctionType::newExpressionType(ContractDefinition const& _c strings parameterNames; StateMutability stateMutability = StateMutability::NonPayable; - solAssert(_contract.contractKind() != ContractDefinition::ContractKind::Interface, ""); + solAssert(!_contract.isInterface(), ""); if (constructor) { |