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

Commandline options.

Browse Source
This commit is contained in:
chriseth 2017-05-23 10:37:51 +02:00
parent 68e1e464be
commit 9a23603af2
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
solc/CommandLineInterface.cpp
View File

@ -80,11 +80,15 @@ static string const g_strBinaryRuntime = "bin-runtime";
static string const g_strCloneBinary = "clone-bin"; static string const g_strCloneBinary = "clone-bin";
static string const g_strCombinedJson = "combined-json"; static string const g_strCombinedJson = "combined-json";
static string const g_strContracts = "contracts"; static string const g_strContracts = "contracts";
static string const g_strEVM = "evm";
static string const g_strEVM15 = "evm15";
static string const g_streWASM = "ewasm";
static string const g_strFormal = "formal"; static string const g_strFormal = "formal";
static string const g_strGas = "gas"; static string const g_strGas = "gas";
static string const g_strHelp = "help"; static string const g_strHelp = "help";
static string const g_strInputFile = "input-file"; static string const g_strInputFile = "input-file";
static string const g_strInterface = "interface"; static string const g_strInterface = "interface";
static string const g_strJulia = "julia";
static string const g_strLibraries = "libraries"; static string const g_strLibraries = "libraries";
static string const g_strLink = "link"; static string const g_strLink = "link";
static string const g_strMetadata = "metadata"; static string const g_strMetadata = "metadata";
@ -121,8 +125,10 @@ static string const g_argFormal = g_strFormal;
static string const g_argGas = g_strGas; static string const g_argGas = g_strGas;
static string const g_argHelp = g_strHelp; static string const g_argHelp = g_strHelp;
static string const g_argInputFile = g_strInputFile; static string const g_argInputFile = g_strInputFile;
static string const g_argJulia = "julia";
static string const g_argLibraries = g_strLibraries; static string const g_argLibraries = g_strLibraries;
static string const g_argLink = g_strLink; static string const g_argLink = g_strLink;
static string const g_argMachine = "machine";
static string const g_argMetadata = g_strMetadata; static string const g_argMetadata = g_strMetadata;
static string const g_argNatspecDev = g_strNatspecDev; static string const g_argNatspecDev = g_strNatspecDev;
static string const g_argNatspecUser = g_strNatspecUser; static string const g_argNatspecUser = g_strNatspecUser;
@ -154,6 +160,14 @@ static set<string> const g_combinedJsonArgs{
g_strSrcMapRuntime g_strSrcMapRuntime
}; };
/// Possible arguments to for --machine
static set<string> const g_machineArgs
{
g_strEVM,
g_strEVM15,
g_streWASM
};
static void version() static void version()
{ {
cout << cout <<
@ -539,7 +553,16 @@ Allowed options)",
) )
( (
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 except --machine and assumes input is assembly."
)
(
g_argJulia.c_str(),
"Switch to JULIA mode, ignoring all options except --machine and assumes input is JULIA."
)
(
g_argMachine.c_str(),
po::value<string>()->value_name(boost::join(g_machineArgs, ",")),
"Target machine in assembly or JULIA mode."
) )
( (
g_argLink.c_str(), g_argLink.c_str(),
@ -689,10 +712,25 @@ bool CommandLineInterface::processInput()
if (!parseLibraryOption(library)) if (!parseLibraryOption(library))
return false; return false;
if (m_args.count(g_argAssemble)) if (m_args.count(g_argAssemble) || m_args.count(g_argJulia))
{ {
// switch to assembly mode // switch to assembly mode
m_onlyAssemble = true; m_onlyAssemble = true;
if (m_args.count(g_argMachine))
{
string machine = m_args[g_argMachine].as<string>();
if (machine == g_strEVM)
m_assemblyMachine = AssemblyMachine::EVM;
else if (machine == g_strEVM15)
m_assemblyMachine = AssemblyMachine::EVM15;
else if (machine == g_streWASM)
m_assemblyMachine = AssemblyMachine::eWasm;
else
{
cerr << "Invalid option for --machine: " << machine << endl;
return false;
}
}
return assemble(); return assemble();
} }
if (m_args.count(g_argLink)) if (m_args.count(g_argLink))

6
solc/CommandLineInterface.h
View File

@ -86,6 +86,12 @@ private:
bool m_error = false; ///< If true, some error occurred. bool m_error = false; ///< If true, some error occurred.
bool m_onlyAssemble = false; bool m_onlyAssemble = false;
/// Settings to use in assembly / JULIA mode.
enum class AssemblyInput { JULIA, Assembly };
enum class AssemblyMachine { EVM, EVM15, eWasm };
AssemblyInput m_assemblyInput = AssemblyInput::Assembly;
AssemblyMachine m_assemblyMachine = AssemblyMachine::EVM;
bool m_onlyLink = false; bool m_onlyLink = false;
/// Compiler arguments variable map /// Compiler arguments variable map