diff options
| author | chriseth <chris@ethereum.org> | 2016-11-16 02:16:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-16 02:16:07 +0800 |
| commit | 192a81892dca3762c050f159da202c8c8f90f72c (patch) | |
| tree | 049fdd9eaf1bbe8ec18ff643739378a076d54e9e /libsolidity/interface/InterfaceHandler.cpp | |
| parent | 0072160d7772b2f30c2c6af4428728cb31641696 (diff) | |
| parent | 227f6aab4f96003e0f7c99194a9ea1095041970f (diff) | |
| download | dexon-solidity-192a81892dca3762c050f159da202c8c8f90f72c.tar dexon-solidity-192a81892dca3762c050f159da202c8c8f90f72c.tar.gz dexon-solidity-192a81892dca3762c050f159da202c8c8f90f72c.tar.bz2 dexon-solidity-192a81892dca3762c050f159da202c8c8f90f72c.tar.lz dexon-solidity-192a81892dca3762c050f159da202c8c8f90f72c.tar.xz dexon-solidity-192a81892dca3762c050f159da202c8c8f90f72c.tar.zst dexon-solidity-192a81892dca3762c050f159da202c8c8f90f72c.zip | |
Merge pull request #1377 from ethereum/keep-json-values
Keep internal results in JSON
Diffstat (limited to 'libsolidity/interface/InterfaceHandler.cpp')
| -rw-r--r-- | libsolidity/interface/InterfaceHandler.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/libsolidity/interface/InterfaceHandler.cpp b/libsolidity/interface/InterfaceHandler.cpp index 1686f9ea..5705856c 100644 --- a/libsolidity/interface/InterfaceHandler.cpp +++ b/libsolidity/interface/InterfaceHandler.cpp @@ -8,7 +8,7 @@ using namespace std; using namespace dev; using namespace dev::solidity; -string InterfaceHandler::documentation( +Json::Value InterfaceHandler::documentation( ContractDefinition const& _contractDef, DocumentationType _type ) @@ -24,10 +24,9 @@ string InterfaceHandler::documentation( } BOOST_THROW_EXCEPTION(InternalCompilerError() << errinfo_comment("Unknown documentation type")); - return ""; } -string InterfaceHandler::abiInterface(ContractDefinition const& _contractDef) +Json::Value InterfaceHandler::abiInterface(ContractDefinition const& _contractDef) { Json::Value abi(Json::arrayValue); @@ -104,12 +103,10 @@ string InterfaceHandler::abiInterface(ContractDefinition const& _contractDef) abi.append(event); } - Json::FastWriter writer; - writer.omitEndingLineFeed(); - return writer.write(abi); + return abi; } -string InterfaceHandler::userDocumentation(ContractDefinition const& _contractDef) +Json::Value InterfaceHandler::userDocumentation(ContractDefinition const& _contractDef) { Json::Value doc; Json::Value methods(Json::objectValue); @@ -129,10 +126,10 @@ string InterfaceHandler::userDocumentation(ContractDefinition const& _contractDe } doc["methods"] = methods; - return Json::StyledWriter().write(doc); + return doc; } -string InterfaceHandler::devDocumentation(ContractDefinition const& _contractDef) +Json::Value InterfaceHandler::devDocumentation(ContractDefinition const& _contractDef) { Json::Value doc; Json::Value methods(Json::objectValue); @@ -178,7 +175,7 @@ string InterfaceHandler::devDocumentation(ContractDefinition const& _contractDef } doc["methods"] = methods; - return Json::StyledWriter().write(doc); + return doc; } string InterfaceHandler::extractDoc(multimap<string, DocTag> const& _tags, string const& _name) |