aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-06-15 03:24:53 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-06-15 04:21:26 +0800
commit18fc66765808c717c0ed5f3f2b3da979618c329d (patch)
tree8145f39b07bc6bf432880711163e57bc270b4ed0
parent398099f50eaa7a4862950914054dbe68d0eee67b (diff)
downloaddexon-solidity-18fc66765808c717c0ed5f3f2b3da979618c329d.tar.gz
dexon-solidity-18fc66765808c717c0ed5f3f2b3da979618c329d.tar.zst
dexon-solidity-18fc66765808c717c0ed5f3f2b3da979618c329d.zip
Remove obsolete Assembly::out
-rw-r--r--libevmasm/Assembly.cpp7
-rw-r--r--libevmasm/Assembly.h1
-rw-r--r--liblll/Compiler.cpp5
3 files changed, 3 insertions, 10 deletions
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index de51d230..68c02bb6 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -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)
diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h
index bf7404d2..6549cc45 100644
--- a/libevmasm/Assembly.h
+++ b/libevmasm/Assembly.h
@@ -87,7 +87,6 @@ public:
void popTo(int _deposit) { while (m_deposit > _deposit) append(solidity::Instruction::POP); }
void injectStart(AssemblyItem const& _i);
- std::string out() const;
int deposit() const { return m_deposit; }
void adjustDeposit(int _adjustment) { m_deposit += _adjustment; if (asserts(m_deposit >= 0)) BOOST_THROW_EXCEPTION(InvalidDeposit()); }
void setDeposit(int _deposit) { m_deposit = _deposit; if (asserts(m_deposit >= 0)) BOOST_THROW_EXCEPTION(InvalidDeposit()); }
diff --git a/liblll/Compiler.cpp b/liblll/Compiler.cpp
index ea8b27af..05376cd5 100644
--- a/liblll/Compiler.cpp
+++ b/liblll/Compiler.cpp
@@ -69,10 +69,11 @@ std::string dev::eth::compileLLLToAsm(std::string const& _src, bool _opt, std::v
{
CompilerState cs;
cs.populateStandard();
- string ret = CodeFragment::compile(_src, cs).assembly(cs).optimise(_opt).out();
+ stringstream ret;
+ CodeFragment::compile(_src, cs).assembly(cs).optimise(_opt).stream(ret);
for (auto i: cs.treesToKill)
killBigints(i);
- return ret;
+ return ret.str();
}
catch (Exception const& _e)
{