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

Merge pull request #107 from chriseth/warningsForSoljson

Browse Source 
Support warnings.
This commit is contained in:
chriseth 2015-10-05 11:17:05 +02:00
commit 7ff6762917
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
solc/jsonCompiler.cpp
View File

@ -122,13 +122,17 @@ string compile(string _input, bool _optimize)
Json::Value output(Json::objectValue); Json::Value output(Json::objectValue);
Json::Value errors(Json::arrayValue); Json::Value errors(Json::arrayValue);
CompilerStack compiler; CompilerStack compiler;
bool success = false;
try try
{ {
if (!compiler.compile(_input, _optimize)) bool succ = compiler.compile(_input, _optimize);
{ for (auto const& error: compiler.errors())
for (auto const& error: compiler.errors()) errors.append(formatError(
errors.append(formatError(*error, "Error", compiler)); *error,
} (dynamic_pointer_cast<Warning const>(error)) ? "Warning" : "Error",
compiler
));
success = succ; // keep success false on exception
} }
catch (ParserError const& exception) catch (ParserError const& exception)
{ {
@ -164,30 +168,30 @@ string compile(string _input, bool _optimize)
} }
if (errors.size() > 0) if (errors.size() > 0)
{
output["errors"] = errors; output["errors"] = errors;
return Json::FastWriter().write(output);
}
output["contracts"] = Json::Value(Json::objectValue); if (success)
for (string const& contractName: compiler.contractNames())
{ {
Json::Value contractData(Json::objectValue); output["contracts"] = Json::Value(Json::objectValue);
contractData["solidity_interface"] = compiler.solidityInterface(contractName); for (string const& contractName: compiler.contractNames())
contractData["interface"] = compiler.interface(contractName); {
contractData["bytecode"] = compiler.object(contractName).toHex(); Json::Value contractData(Json::objectValue);
contractData["runtimeBytecode"] = compiler.runtimeObject(contractName).toHex(); contractData["solidity_interface"] = compiler.solidityInterface(contractName);
contractData["opcodes"] = eth::disassemble(compiler.object(contractName).bytecode); contractData["interface"] = compiler.interface(contractName);
contractData["functionHashes"] = functionHashes(compiler.contractDefinition(contractName)); contractData["bytecode"] = compiler.object(contractName).toHex();
contractData["gasEstimates"] = estimateGas(compiler, contractName); contractData["runtimeBytecode"] = compiler.runtimeObject(contractName).toHex();
ostringstream unused; contractData["opcodes"] = eth::disassemble(compiler.object(contractName).bytecode);
contractData["assembly"] = compiler.streamAssembly(unused, contractName, sources, true); contractData["functionHashes"] = functionHashes(compiler.contractDefinition(contractName));
output["contracts"][contractName] = contractData; contractData["gasEstimates"] = estimateGas(compiler, contractName);
} ostringstream unused;
contractData["assembly"] = compiler.streamAssembly(unused, contractName, sources, true);
output["contracts"][contractName] = contractData;
}
output["sources"] = Json::Value(Json::objectValue); output["sources"] = Json::Value(Json::objectValue);
output["sources"][""] = Json::Value(Json::objectValue); output["sources"][""] = Json::Value(Json::objectValue);
output["sources"][""]["AST"] = ASTJsonConverter(compiler.ast("")).json(); output["sources"][""]["AST"] = ASTJsonConverter(compiler.ast("")).json();
}
return Json::FastWriter().write(output); return Json::FastWriter().write(output);
} }