diff options
| author | chriseth <chris@ethereum.org> | 2017-06-15 14:41:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 14:41:14 +0800 |
| commit | 3cb71ac51624377174029e244b3cef950dedbfe8 (patch) | |
| tree | c562a2a0577edbe6cfcda9e10ee63e7643763b80 /libevmasm/Assembly.cpp | |
| parent | 71fea1e370dfb2d9cb812bcd40b2f8a63ed1d5e0 (diff) | |
| parent | c08c4b8b6f0e8c4ccc139e525218cb0cb1ac4ad4 (diff) | |
| download | dexon-solidity-3cb71ac51624377174029e244b3cef950dedbfe8.tar dexon-solidity-3cb71ac51624377174029e244b3cef950dedbfe8.tar.gz dexon-solidity-3cb71ac51624377174029e244b3cef950dedbfe8.tar.bz2 dexon-solidity-3cb71ac51624377174029e244b3cef950dedbfe8.tar.lz dexon-solidity-3cb71ac51624377174029e244b3cef950dedbfe8.tar.xz dexon-solidity-3cb71ac51624377174029e244b3cef950dedbfe8.tar.zst dexon-solidity-3cb71ac51624377174029e244b3cef950dedbfe8.zip | |
Merge pull request #2398 from ethereum/assembly-cleanup
Remove obsolete features from libevmasm
Diffstat (limited to 'libevmasm/Assembly.cpp')
| -rw-r--r-- | libevmasm/Assembly.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp index f2a292b0..92a4c2a4 100644 --- a/libevmasm/Assembly.cpp +++ b/libevmasm/Assembly.cpp @@ -40,7 +40,7 @@ void Assembly::append(Assembly const& _a) auto newDeposit = m_deposit + _a.deposit(); for (AssemblyItem i: _a.m_items) { - if (i.type() == Tag || (i.type() == PushTag && i != errorTag())) + if (i.type() == Tag || i.type() == PushTag) i.setData(i.data() + m_usedTags); else if (i.type() == PushSub || i.type() == PushSubSize) i.setData(i.data() + m_subs.size()); @@ -72,13 +72,6 @@ void Assembly::append(Assembly const& _a, int _deposit) } } -string Assembly::out() const -{ - stringstream ret; - stream(ret); - return ret.str(); -} - unsigned Assembly::bytesRequired(unsigned subTagSize) const { for (unsigned tagSize = subTagSize; true; ++tagSize) |