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 /libsolidity/interface/CompilerStack.h | |
| 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 'libsolidity/interface/CompilerStack.h')
| -rw-r--r-- | libsolidity/interface/CompilerStack.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h index 2756e57d..f1bbae47 100644 --- a/libsolidity/interface/CompilerStack.h +++ b/libsolidity/interface/CompilerStack.h @@ -190,11 +190,15 @@ public: /// if the contract does not (yet) have bytecode. std::string const* runtimeSourceMapping(std::string const& _contractName = "") const; - /// Streams a verbose version of the assembly to @a _outStream. + /// @return a verbose text representation of the assembly. /// @arg _sourceCodes is the map of input files to source code strings - /// @arg _inJsonFromat shows whether the out should be in Json format /// Prerequisite: Successful compilation. - Json::Value streamAssembly(std::ostream& _outStream, std::string const& _contractName = "", StringMap _sourceCodes = StringMap(), bool _inJsonFormat = false) const; + std::string assemblyString(std::string const& _contractName = "", StringMap _sourceCodes = StringMap()) const; + + /// @returns a JSON representation of the assembly. + /// @arg _sourceCodes is the map of input files to source code strings + /// Prerequisite: Successful compilation. + Json::Value assemblyJSON(std::string const& _contractName = "", StringMap _sourceCodes = StringMap()) const; /// @returns a JSON representing the contract ABI. /// Prerequisite: Successful call to parse or compile. |