cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Incorporate comments.

Browse Source
This commit is contained in:
chriseth 2016-11-16 14:36:19 +01:00
parent 5789eaa78d
commit e666f8cda7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libsolidity/interface/CompilerStack.cpp
View File

@ -40,6 +40,7 @@
#include <libevmasm/Exceptions.h> #include <libevmasm/Exceptions.h>
#include <libdevcore/SwarmHash.h> #include <libdevcore/SwarmHash.h>
#include <libdevcore/JSON.h>
#include <json/json.h> #include <json/json.h>
@ -668,19 +669,19 @@ string CompilerStack::createOnChainMetadata(Contract const& _contract) const
meta["version"] = 1; meta["version"] = 1;
meta["language"] = "Solidity"; meta["language"] = "Solidity";
meta["compiler"]["version"] = VersionString; meta["compiler"]["version"] = VersionString;
meta["compilationTarget"] =
_contract.contract->sourceUnitName() +
":" +
_contract.contract->annotation().canonicalName;
for (auto const& s: m_sources) for (auto const& s: m_sources)
{ {
solAssert(s.second.scanner, "Scanner not available"); solAssert(s.second.scanner, "Scanner not available");
meta["sources"][s.first]["swarm"] = meta["sources"][s.first]["keccak256"] =
"0x" + toHex(dev::swarmHash(s.second.scanner->source()).asBytes()); "0x" + toHex(dev::keccak256(s.second.scanner->source()).asBytes());
meta["sources"][s.first]["url"] =
"bzzr://" + toHex(dev::swarmHash(s.second.scanner->source()).asBytes());
} }
meta["settings"]["optimizer"]["enabled"] = m_optimize; meta["settings"]["optimizer"]["enabled"] = m_optimize;
meta["settings"]["optimizer"]["runs"] = m_optimizeRuns; meta["settings"]["optimizer"]["runs"] = m_optimizeRuns;
meta["settings"]["compilationTarget"][_contract.contract->sourceUnitName()] =
_contract.contract->annotation().canonicalName;
set<string> remappings; set<string> remappings;
for (auto const& r: m_remappings) for (auto const& r: m_remappings)
@ -692,11 +693,10 @@ string CompilerStack::createOnChainMetadata(Contract const& _contract) const
meta["settings"]["libraries"][library.first] = "0x" + toHex(library.second.asBytes()); meta["settings"]["libraries"][library.first] = "0x" + toHex(library.second.asBytes());
meta["output"]["abi"] = metadata(_contract, DocumentationType::ABIInterface); meta["output"]["abi"] = metadata(_contract, DocumentationType::ABIInterface);
meta["output"]["natspec"] = metadata(_contract, DocumentationType::NatspecUser); meta["output"]["userdoc"] = metadata(_contract, DocumentationType::NatspecUser);
meta["output"]["devdoc"] = metadata(_contract, DocumentationType::NatspecDev);
Json::FastWriter writer; return jsonCompactPrint(meta);
writer.omitEndingLineFeed();
return writer.write(meta);
} }
string CompilerStack::computeSourceMapping(eth::AssemblyItems const& _items) const string CompilerStack::computeSourceMapping(eth::AssemblyItems const& _items) const