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

Add --standard-json to solc

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-02-09 14:55:57 +00:00
parent 965de29772
commit 8c9e57fadf
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
solc/CommandLineInterface.cpp
View File

@ -32,6 +32,7 @@
#include <libsolidity/analysis/NameAndTypeResolver.h> #include <libsolidity/analysis/NameAndTypeResolver.h>
#include <libsolidity/interface/Exceptions.h> #include <libsolidity/interface/Exceptions.h>
#include <libsolidity/interface/CompilerStack.h> #include <libsolidity/interface/CompilerStack.h>
#include <libsolidity/interface/StandardCompiler.h>
#include <libsolidity/interface/SourceReferenceFormatter.h> #include <libsolidity/interface/SourceReferenceFormatter.h>
#include <libsolidity/interface/GasEstimator.h> #include <libsolidity/interface/GasEstimator.h>
#include <libsolidity/formal/Why3Translator.h> #include <libsolidity/formal/Why3Translator.h>
@ -103,6 +104,7 @@ static string const g_strVersion = "version";
static string const g_stdinFileNameStr = "<stdin>"; static string const g_stdinFileNameStr = "<stdin>";
static string const g_strMetadataLiteral = "metadata-literal"; static string const g_strMetadataLiteral = "metadata-literal";
static string const g_strAllowPaths = "allow-paths"; static string const g_strAllowPaths = "allow-paths";
static string const g_strStandardJSON = "standard-json";
static string const g_argAbi = g_strAbi; static string const g_argAbi = g_strAbi;
static string const g_argAddStandard = g_strAddStandard; static string const g_argAddStandard = g_strAddStandard;
@ -133,6 +135,7 @@ static string const g_argVersion = g_strVersion;
static string const g_stdinFileName = g_stdinFileNameStr; static string const g_stdinFileName = g_stdinFileNameStr;
static string const g_argMetadataLiteral = g_strMetadataLiteral; static string const g_argMetadataLiteral = g_strMetadataLiteral;
static string const g_argAllowPaths = g_strAllowPaths; static string const g_argAllowPaths = g_strAllowPaths;
static string const g_argStandardJSON = g_strStandardJSON;
/// Possible arguments to for --combined-json /// Possible arguments to for --combined-json
static set<string> const g_combinedJsonArgs{ static set<string> const g_combinedJsonArgs{
@ -526,6 +529,11 @@ Allowed options)",
"Output a single json document containing the specified information." "Output a single json document containing the specified information."
) )
(g_argGas.c_str(), "Print an estimate of the maximal gas usage for each function.") (g_argGas.c_str(), "Print an estimate of the maximal gas usage for each function.")
(
g_argStandardJSON.c_str(),
"Switch to Standard JSON input / output mode, ignoring all options."
"It reads from standard input and provides the result on the standard output."
)
( (
g_argAssemble.c_str(), g_argAssemble.c_str(),
"Switch to assembly mode, ignoring all options and assumes input is assembly." "Switch to assembly mode, ignoring all options and assumes input is assembly."
@ -615,6 +623,20 @@ bool CommandLineInterface::processInput()
m_allowedDirectories.push_back(boost::filesystem::path(path)); m_allowedDirectories.push_back(boost::filesystem::path(path));
} }
if (m_args.count(g_argStandardJSON))
{
string input;
while (!cin.eof())
{
string tmp;
getline(cin, tmp);
input.append(tmp + "\n");
}
StandardCompiler compiler;
cout << compiler.compile(input) << endl;
return true;
}
readInputFilesAndConfigureRemappings(); readInputFilesAndConfigureRemappings();
if (m_args.count(g_argLibraries)) if (m_args.count(g_argLibraries))
@ -882,7 +904,9 @@ void CommandLineInterface::handleAst(string const& _argStr)
bool CommandLineInterface::actOnInput() bool CommandLineInterface::actOnInput()
{ {
if (m_onlyAssemble) if (m_args.count(g_argStandardJSON))
return true;
else if (m_onlyAssemble)
outputAssembly(); outputAssembly();
else if (m_onlyLink) else if (m_onlyLink)
writeLinkedFiles(); writeLinkedFiles();