diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-08-30 08:58:19 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2017-09-11 22:48:58 +0800 |
| commit | 50570c6c794eee01af64751c884fb6cb68f8dffc (patch) | |
| tree | 5ed3c757106ddba44ad2194c773ad70317c9272b /libsolidity | |
| parent | a535a8b06ed1b9c0c5fd41805a4fe39939755f05 (diff) | |
| download | dexon-solidity-50570c6c794eee01af64751c884fb6cb68f8dffc.tar.gz dexon-solidity-50570c6c794eee01af64751c884fb6cb68f8dffc.tar.zst dexon-solidity-50570c6c794eee01af64751c884fb6cb68f8dffc.zip | |
Do not return the stream in asssemblyStream
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/codegen/Compiler.h | 4 | ||||
| -rw-r--r-- | libsolidity/codegen/CompilerContext.h | 4 | ||||
| -rw-r--r-- | libsolidity/interface/CompilerStack.cpp | 5 | ||||
| -rw-r--r-- | libsolidity/interface/CompilerStack.h | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/libsolidity/codegen/Compiler.h b/libsolidity/codegen/Compiler.h index 1224ff60..5233cc91 100644 --- a/libsolidity/codegen/Compiler.h +++ b/libsolidity/codegen/Compiler.h @@ -60,9 +60,9 @@ public: /// @returns Only the runtime object (without constructor). eth::LinkerObject runtimeObject() const { return m_context.assembledRuntimeObject(m_runtimeSub); } /// @arg _sourceCodes is the map of input files to source code strings - std::ostream& assemblyStream(std::ostream& _stream, StringMap const& _sourceCodes = StringMap()) const + void assemblyStream(std::ostream& _stream, StringMap const& _sourceCodes = StringMap()) const { - return m_context.assemblyStream(_stream, _sourceCodes); + m_context.assemblyStream(_stream, _sourceCodes); } /// @arg _sourceCodes is the map of input files to source code strings Json::Value assemblyJSON(StringMap const& _sourceCodes = StringMap()) const diff --git a/libsolidity/codegen/CompilerContext.h b/libsolidity/codegen/CompilerContext.h index de79aa42..47d4edde 100644 --- a/libsolidity/codegen/CompilerContext.h +++ b/libsolidity/codegen/CompilerContext.h @@ -209,9 +209,9 @@ public: eth::Assembly& nonConstAssembly() { return *m_asm; } /// @arg _sourceCodes is the map of input files to source code strings - std::ostream& assemblyStream(std::ostream& _stream, StringMap const& _sourceCodes = StringMap()) const + void assemblyStream(std::ostream& _stream, StringMap const& _sourceCodes = StringMap()) const { - return m_asm->assemblyStream(_stream, "", _sourceCodes); + m_asm->assemblyStream(_stream, "", _sourceCodes); } /// @arg _sourceCodes is the map of input files to source code strings diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp index 4002bac3..5f62bb03 100644 --- a/libsolidity/interface/CompilerStack.cpp +++ b/libsolidity/interface/CompilerStack.cpp @@ -347,15 +347,14 @@ eth::LinkerObject const& CompilerStack::cloneObject(string const& _contractName) return contract(_contractName).cloneObject; } -ostream& CompilerStack::assemblyStream(ostream& _outStream, string const& _contractName, StringMap _sourceCodes) const +void CompilerStack::assemblyStream(ostream& _outStream, string const& _contractName, StringMap _sourceCodes) const { Contract const& currentContract = contract(_contractName); if (currentContract.compiler) - return currentContract.compiler->assemblyStream(_outStream, _sourceCodes); + currentContract.compiler->assemblyStream(_outStream, _sourceCodes); else { _outStream << "Contract not fully implemented" << endl; - return _outStream; } } diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h index 207778f0..2f1b9bb3 100644 --- a/libsolidity/interface/CompilerStack.h +++ b/libsolidity/interface/CompilerStack.h @@ -193,7 +193,7 @@ public: /// Streams a verbose version of the assembly to @a _outStream. /// @arg _sourceCodes is the map of input files to source code strings /// Prerequisite: Successful compilation. - std::ostream& assemblyStream(std::ostream& _outStream, std::string const& _contractName = "", StringMap _sourceCodes = StringMap()) const; + void assemblyStream(std::ostream& _outStream, 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 |