diff options
| author | Daniel Kirchner <daniel@ekpyron.org> | 2018-03-06 00:00:37 +0800 |
|---|---|---|
| committer | Daniel Kirchner <daniel@ekpyron.org> | 2018-03-06 00:00:37 +0800 |
| commit | 3340053fd95b73facc8a1534a130f58698808f2e (patch) | |
| tree | 3e10e6ac7a09499c14a6816b6a26e2aedabb0f60 /libsolidity | |
| parent | b8589fbe0f4eea7b74ce45c2dbaf1bbf710e7287 (diff) | |
| download | dexon-solidity-3340053fd95b73facc8a1534a130f58698808f2e.tar dexon-solidity-3340053fd95b73facc8a1534a130f58698808f2e.tar.gz dexon-solidity-3340053fd95b73facc8a1534a130f58698808f2e.tar.bz2 dexon-solidity-3340053fd95b73facc8a1534a130f58698808f2e.tar.lz dexon-solidity-3340053fd95b73facc8a1534a130f58698808f2e.tar.xz dexon-solidity-3340053fd95b73facc8a1534a130f58698808f2e.tar.zst dexon-solidity-3340053fd95b73facc8a1534a130f58698808f2e.zip | |
Style improvements.
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/ast/Types.cpp | 4 | ||||
| -rw-r--r-- | libsolidity/codegen/ExpressionCompiler.cpp | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp index bde0dd6e..26bde1c4 100644 --- a/libsolidity/ast/Types.cpp +++ b/libsolidity/ast/Types.cpp @@ -3000,7 +3000,7 @@ bool MagicType::operator==(Type const& _other) const return other.m_kind == m_kind; } -MemberList::MemberMap MagicType::nativeMembers(ContractDefinition const *_contract) const +MemberList::MemberMap MagicType::nativeMembers(ContractDefinition const* _contract) const { solAssert(_contract, ""); const bool v050 = _contract->sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::V050); @@ -3025,7 +3025,7 @@ MemberList::MemberMap MagicType::nativeMembers(ContractDefinition const *_contra }; if (!v050) members.emplace_back("gas", make_shared<IntegerType>(256)); - return MemberList::MemberMap(members); + return members; } case Kind::Transaction: return MemberList::MemberMap({ diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp index d3599367..58e2aa62 100644 --- a/libsolidity/codegen/ExpressionCompiler.cpp +++ b/libsolidity/codegen/ExpressionCompiler.cpp @@ -924,7 +924,7 @@ bool ExpressionCompiler::visit(NewExpression const&) bool ExpressionCompiler::visit(MemberAccess const& _memberAccess) { - const bool v050 = m_context.experimentalFeatureActive(ExperimentalFeature::V050); + bool const v050 = m_context.experimentalFeatureActive(ExperimentalFeature::V050); CompilerContext::LocationSetter locationSetter(m_context, _memberAccess); // Check whether the member is a bound function. @@ -1140,8 +1140,11 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess) m_context << Instruction::CALLVALUE; else if (member == "origin") m_context << Instruction::ORIGIN; - else if (!v050 && member == "gas") + else if (member == "gas") + { + solAssert(!v050, ""); m_context << Instruction::GAS; + } else if (member == "gasprice") m_context << Instruction::GASPRICE; else if (member == "data") |