diff options
| author | chriseth <chris@ethereum.org> | 2018-03-06 03:11:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-06 03:11:37 +0800 |
| commit | 3793aa405b9326c7269ed001344d721ae05629e8 (patch) | |
| tree | 2657e731bf0f2a6c608ffefcdb3d5731b3e77fe0 /libsolidity/ast | |
| parent | f190b274313131bbc939815a00d49dcd2c3de10d (diff) | |
| parent | 2213f9946b34a6e8f5604a6b821d31788dcee08b (diff) | |
| download | dexon-solidity-3793aa405b9326c7269ed001344d721ae05629e8.tar.gz dexon-solidity-3793aa405b9326c7269ed001344d721ae05629e8.tar.zst dexon-solidity-3793aa405b9326c7269ed001344d721ae05629e8.zip | |
Merge pull request #3643 from ethereum/gasleft
Move msg.gas to global function gasleft(). Closes #2971.
Diffstat (limited to 'libsolidity/ast')
| -rw-r--r-- | libsolidity/ast/Types.cpp | 14 | ||||
| -rw-r--r-- | libsolidity/ast/Types.h | 3 |
2 files changed, 12 insertions, 5 deletions
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp index 771ae643..26bde1c4 100644 --- a/libsolidity/ast/Types.cpp +++ b/libsolidity/ast/Types.cpp @@ -3000,8 +3000,10 @@ bool MagicType::operator==(Type const& _other) const return other.m_kind == m_kind; } -MemberList::MemberMap MagicType::nativeMembers(ContractDefinition const*) const +MemberList::MemberMap MagicType::nativeMembers(ContractDefinition const* _contract) const { + solAssert(_contract, ""); + const bool v050 = _contract->sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::V050); switch (m_kind) { case Kind::Block: @@ -3014,13 +3016,17 @@ MemberList::MemberMap MagicType::nativeMembers(ContractDefinition const*) const {"gaslimit", make_shared<IntegerType>(256)} }); case Kind::Message: - return MemberList::MemberMap({ + { + std::vector<MemberList::Member> members = { {"sender", make_shared<IntegerType>(160, IntegerType::Modifier::Address)}, - {"gas", make_shared<IntegerType>(256)}, {"value", make_shared<IntegerType>(256)}, {"data", make_shared<ArrayType>(DataLocation::CallData)}, {"sig", make_shared<FixedBytesType>(4)} - }); + }; + if (!v050) + members.emplace_back("gas", make_shared<IntegerType>(256)); + return members; + } case Kind::Transaction: return MemberList::MemberMap({ {"origin", make_shared<IntegerType>(160, IntegerType::Modifier::Address)}, diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h index 7985521e..c20a025f 100644 --- a/libsolidity/ast/Types.h +++ b/libsolidity/ast/Types.h @@ -902,7 +902,8 @@ public: ByteArrayPush, ///< .push() to a dynamically sized byte array in storage ObjectCreation, ///< array creation using new Assert, ///< assert() - Require ///< require() + Require, ///< require() + GasLeft ///< gasleft() }; virtual Category category() const override { return Category::Function; } |