diff options
| author | chriseth <chris@ethereum.org> | 2017-09-12 19:23:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 19:23:59 +0800 |
| commit | 513ae59bba018d865fef620c79f131b70554c042 (patch) | |
| tree | fc40ae93202787313e1c43822500c9126a1eedf4 /liblll/Compiler.cpp | |
| parent | 4cb5502faa2004d738c25e4dcdf4f6678540017e (diff) | |
| parent | bd6510d99a503ddbdbfaa9bd459f020215f8a028 (diff) | |
| download | dexon-solidity-513ae59bba018d865fef620c79f131b70554c042.tar dexon-solidity-513ae59bba018d865fef620c79f131b70554c042.tar.gz dexon-solidity-513ae59bba018d865fef620c79f131b70554c042.tar.bz2 dexon-solidity-513ae59bba018d865fef620c79f131b70554c042.tar.lz dexon-solidity-513ae59bba018d865fef620c79f131b70554c042.tar.xz dexon-solidity-513ae59bba018d865fef620c79f131b70554c042.tar.zst dexon-solidity-513ae59bba018d865fef620c79f131b70554c042.zip | |
Merge pull request #2853 from ethereum/cleanup-asm-stream
Split out the JSON functionality from assembly.stream()
Diffstat (limited to 'liblll/Compiler.cpp')
| -rw-r--r-- | liblll/Compiler.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/liblll/Compiler.cpp b/liblll/Compiler.cpp index 4ec11ca9..b69675aa 100644 --- a/liblll/Compiler.cpp +++ b/liblll/Compiler.cpp @@ -72,14 +72,13 @@ std::string dev::eth::compileLLLToAsm(std::string const& _src, bool _opt, std::v { CompilerState cs; cs.populateStandard(); - stringstream ret; auto assembly = CodeFragment::compile(_src, cs).assembly(cs); if (_opt) assembly = assembly.optimise(true); - assembly.stream(ret); + string ret = assembly.assemblyString(); for (auto i: cs.treesToKill) killBigints(i); - return ret.str(); + return ret; } catch (Exception const& _e) { |