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 /solc/jsonCompiler.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 'solc/jsonCompiler.cpp')
| -rw-r--r-- | solc/jsonCompiler.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp index e5be8404..771f0df8 100644 --- a/solc/jsonCompiler.cpp +++ b/solc/jsonCompiler.cpp @@ -27,6 +27,7 @@ #include <libdevcore/Common.h> #include <libdevcore/CommonData.h> #include <libdevcore/CommonIO.h> +#include <libdevcore/JSON.h> #include <libevmasm/Instruction.h> #include <libevmasm/GasMeter.h> #include <libsolidity/parsing/Scanner.h> @@ -213,7 +214,7 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback for (string const& contractName: compiler.contractNames()) { Json::Value contractData(Json::objectValue); - contractData["interface"] = compiler.interface(contractName); + contractData["interface"] = dev::jsonCompactPrint(compiler.interface(contractName)); contractData["bytecode"] = compiler.object(contractName).toHex(); contractData["runtimeBytecode"] = compiler.runtimeObject(contractName).toHex(); contractData["opcodes"] = solidity::disassemble(compiler.object(contractName).bytecode); @@ -274,7 +275,7 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback try { - return Json::FastWriter().write(output); + return dev::jsonCompactPrint(output); } catch (...) { @@ -292,7 +293,7 @@ string compileMulti(string const& _input, bool _optimize, CStyleReadFileCallback errors.append("Error parsing input JSON: " + reader.getFormattedErrorMessages()); Json::Value output(Json::objectValue); output["errors"] = errors; - return Json::FastWriter().write(output); + return dev::jsonCompactPrint(output); } else { |