diff options
| author | Gav Wood <i@gavwood.com> | 2014-10-28 03:26:34 +0800 |
|---|---|---|
| committer | Gav Wood <i@gavwood.com> | 2014-10-28 03:26:34 +0800 |
| commit | bded2ff3726c5626ea59b2bcbdf5fcded25457c7 (patch) | |
| tree | da2aa364427d0b26dde66576481e1591b857f76a | |
| parent | 9c691e917fcfd291fcaa3c6aaff8c8242fc50873 (diff) | |
| download | dexon-solidity-bded2ff3726c5626ea59b2bcbdf5fcded25457c7.tar dexon-solidity-bded2ff3726c5626ea59b2bcbdf5fcded25457c7.tar.gz dexon-solidity-bded2ff3726c5626ea59b2bcbdf5fcded25457c7.tar.bz2 dexon-solidity-bded2ff3726c5626ea59b2bcbdf5fcded25457c7.tar.lz dexon-solidity-bded2ff3726c5626ea59b2bcbdf5fcded25457c7.tar.xz dexon-solidity-bded2ff3726c5626ea59b2bcbdf5fcded25457c7.tar.zst dexon-solidity-bded2ff3726c5626ea59b2bcbdf5fcded25457c7.zip | |
Draft of new LOG/bloom/headers/block format.
| -rw-r--r-- | Assembly.cpp | 4 | ||||
| -rw-r--r-- | Assembly.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Assembly.cpp b/Assembly.cpp index c26a9a98..5b10138d 100644 --- a/Assembly.cpp +++ b/Assembly.cpp @@ -147,7 +147,7 @@ ostream& dev::eth::operator<<(ostream& _out, AssemblyItemsConstRef _i) return _out; } -ostream& Assembly::streamOut(ostream& _out, string const& _prefix) const +ostream& Assembly::streamRLP(ostream& _out, string const& _prefix) const { _out << _prefix << ".code:" << endl; for (AssemblyItem const& i: m_items) @@ -189,7 +189,7 @@ ostream& Assembly::streamOut(ostream& _out, string const& _prefix) const for (auto const& i: m_subs) { _out << _prefix << " " << hex << (unsigned)(u256)i.first << ": " << endl; - i.second.streamOut(_out, _prefix + " "); + i.second.streamRLP(_out, _prefix + " "); } } return _out; @@ -104,11 +104,11 @@ public: void injectStart(AssemblyItem const& _i); - std::string out() const { std::stringstream ret; streamOut(ret); return ret.str(); } + std::string out() const { std::stringstream ret; streamRLP(ret); return ret.str(); } int deposit() const { return m_deposit; } bytes assemble() const; Assembly& optimise(bool _enable); - std::ostream& streamOut(std::ostream& _out, std::string const& _prefix = "") const; + std::ostream& streamRLP(std::ostream& _out, std::string const& _prefix = "") const; private: void donePath() { if (m_totalDeposit != INT_MAX && m_totalDeposit != m_deposit) BOOST_THROW_EXCEPTION(InvalidDeposit()); } @@ -127,7 +127,7 @@ private: inline std::ostream& operator<<(std::ostream& _out, Assembly const& _a) { - _a.streamOut(_out); + _a.streamRLP(_out); return _out; } |