From 254c845490ecbfbf5799bb408d32cf2ea2e09643 Mon Sep 17 00:00:00 2001 From: Liana Husikyan Date: Fri, 17 Apr 2015 16:40:40 +0200 Subject: [PATCH] removed unused parameter from streamAsmJson --- libevmcore/Assembly.cpp | 6 +++--- libevmcore/Assembly.h | 5 +---- libsolidity/CompilerStack.cpp | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/libevmcore/Assembly.cpp b/libevmcore/Assembly.cpp index d21167e6b..ae8567e2a 100644 --- a/libevmcore/Assembly.cpp +++ b/libevmcore/Assembly.cpp @@ -184,7 +184,7 @@ string toStringInHex(u256 _value) return hexStr.str(); } -Json::Value Assembly::streamAsmJson(ostream& _out, StringMap const& _sourceCodes, bool _inJsonFormat) const +Json::Value Assembly::streamAsmJson(ostream& _out, StringMap const& _sourceCodes) const { Json::Value root; @@ -254,7 +254,7 @@ Json::Value Assembly::streamAsmJson(ostream& _out, StringMap const& _sourceCodes { std::stringstream hexStr; hexStr << hex << i; - data[hexStr.str()] = m_subs[i].stream(_out, "", _sourceCodes, _inJsonFormat); + data[hexStr.str()] = m_subs[i].stream(_out, "", _sourceCodes, true); } root[".data"] = data; _out << root; @@ -265,7 +265,7 @@ Json::Value Assembly::streamAsmJson(ostream& _out, StringMap const& _sourceCodes Json::Value Assembly::stream(ostream& _out, string const& _prefix, StringMap const& _sourceCodes, bool _inJsonFormat) const { if (_inJsonFormat) - return streamAsmJson(_out, _sourceCodes, _inJsonFormat); + return streamAsmJson(_out, _sourceCodes); else { streamAsm(_out, _prefix, _sourceCodes); diff --git a/libevmcore/Assembly.h b/libevmcore/Assembly.h index 60df34215..4ac873682 100644 --- a/libevmcore/Assembly.h +++ b/libevmcore/Assembly.h @@ -104,10 +104,7 @@ protected: unsigned bytesRequired() const; private: - Json::Value streamAsmJson(std::ostream& _out, - const StringMap &_sourceCodes, - bool _inJsonFormat - ) const; + Json::Value streamAsmJson(std::ostream& _out, const StringMap &_sourceCodes) const; std::ostream& streamAsm(std::ostream& _out, std::string const& _prefix, StringMap const& _sourceCodes) const; Json::Value createJsonValue(std::string _name, int _begin, int _end, std::string _value = std::string(), std::string _jumpType = std::string()) const; diff --git a/libsolidity/CompilerStack.cpp b/libsolidity/CompilerStack.cpp index 592f61276..d6274e2c7 100644 --- a/libsolidity/CompilerStack.cpp +++ b/libsolidity/CompilerStack.cpp @@ -188,7 +188,7 @@ void CompilerStack::streamAssembly(ostream& _outStream, string const& _contractN { Contract const& contract = getContract(_contractName); if (contract.compiler) - contract(_contractName).compiler->streamAssembly(_outStream, _sourceCodes, _inJsonFormat); + contract.compiler->streamAssembly(_outStream, _sourceCodes, _inJsonFormat); else _outStream << "Contract not fully implemented" << endl; }