diff options
Diffstat (limited to 'solc')
| -rw-r--r-- | solc/CommandLineInterface.cpp | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index 5fe75a14..6a768a00 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -88,12 +88,11 @@ static string const g_strEVM = "evm"; static string const g_strEVM15 = "evm15"; static string const g_strEVMVersion = "evm-version"; static string const g_streWasm = "ewasm"; -static string const g_strFormal = "formal"; static string const g_strGas = "gas"; static string const g_strHelp = "help"; static string const g_strInputFile = "input-file"; static string const g_strInterface = "interface"; -static string const g_strJulia = "julia"; +static string const g_strYul = "yul"; static string const g_strLicense = "license"; static string const g_strLibraries = "libraries"; static string const g_strLink = "link"; @@ -132,11 +131,10 @@ static string const g_argBinaryRuntime = g_strBinaryRuntime; static string const g_argCloneBinary = g_strCloneBinary; static string const g_argCombinedJson = g_strCombinedJson; static string const g_argCompactJSON = g_strCompactJSON; -static string const g_argFormal = g_strFormal; static string const g_argGas = g_strGas; static string const g_argHelp = g_strHelp; static string const g_argInputFile = g_strInputFile; -static string const g_argJulia = g_strJulia; +static string const g_argYul = g_strYul; static string const g_argLibraries = g_strLibraries; static string const g_argLink = g_strLink; static string const g_argMachine = g_strMachine; @@ -216,7 +214,6 @@ static bool needsHumanTargetedStdout(po::variables_map const& _args) g_argBinary, g_argBinaryRuntime, g_argCloneBinary, - g_argFormal, g_argMetadata, g_argNatspecUser, g_argNatspecDev, @@ -450,7 +447,7 @@ bool CommandLineInterface::readInputFilesAndConfigureRemappings() m_sourceCodes[g_stdinFileName] = dev::readStandardInput(); if (m_sourceCodes.size() == 0) { - cerr << "No input files given. If you wish to use the standard input please specify \"-\" explicity." << endl; + cerr << "No input files given. If you wish to use the standard input please specify \"-\" explicitly." << endl; return false; } @@ -600,8 +597,8 @@ Allowed options)", "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_argYul.c_str(), + "Switch to Yul mode, ignoring all options except --machine and assumes input is Yul." ) ( g_argStrictAssembly.c_str(), @@ -610,7 +607,7 @@ Allowed options)", ( g_argMachine.c_str(), po::value<string>()->value_name(boost::join(g_machineArgs, ",")), - "Target machine in assembly or JULIA mode." + "Target machine in assembly or Yul mode." ) ( g_argLink.c_str(), @@ -639,8 +636,7 @@ Allowed options)", (g_argSignatureHashes.c_str(), "Function signature hashes of the contracts.") (g_argNatspecUser.c_str(), "Natspec user documentation of all contracts.") (g_argNatspecDev.c_str(), "Natspec developer documentation of all contracts.") - (g_argMetadata.c_str(), "Combined Metadata JSON whose Swarm hash is stored on-chain.") - (g_argFormal.c_str(), "Translated source suitable for formal analysis. (Deprecated)"); + (g_argMetadata.c_str(), "Combined Metadata JSON whose Swarm hash is stored on-chain."); desc.add(outputComponents); po::options_description allOptions = desc; @@ -785,13 +781,13 @@ bool CommandLineInterface::processInput() m_evmVersion = *versionOption; } - if (m_args.count(g_argAssemble) || m_args.count(g_argStrictAssembly) || m_args.count(g_argJulia)) + if (m_args.count(g_argAssemble) || m_args.count(g_argStrictAssembly) || m_args.count(g_argYul)) { // switch to assembly mode m_onlyAssemble = true; using Input = AssemblyStack::Language; using Machine = AssemblyStack::Machine; - Input inputLanguage = m_args.count(g_argJulia) ? Input::JULIA : (m_args.count(g_argStrictAssembly) ? Input::StrictAssembly : Input::Assembly); + Input inputLanguage = m_args.count(g_argYul) ? Input::Yul : (m_args.count(g_argStrictAssembly) ? Input::StrictAssembly : Input::Assembly); Machine targetMachine = Machine::EVM; if (m_args.count(g_argMachine)) { @@ -1241,9 +1237,6 @@ void CommandLineInterface::outputCompilationResults() handleNatspec(true, contract); handleNatspec(false, contract); } // end of contracts iteration - - if (m_args.count(g_argFormal)) - cerr << "Support for the Why3 output was removed." << endl; } } |