cerc-io/solidity
10
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

CommandLineParser: Initialize inputMode earlier to make it usable in more functions

Browse Source
This commit is contained in:
Kamil Śliwak 2021-06-13 14:30:16 +02:00
parent 3b104a3f38
commit c938f35b99
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
solc/CommandLineParser.cpp
View File

@ -871,10 +871,19 @@ General Information)").c_str(),
})) }))
return false; return false;
if (m_args.count(g_strStandardJSON)) if (m_args.count(g_strStandardJSON) > 0)
{
m_options.input.mode = InputMode::StandardJson; m_options.input.mode = InputMode::StandardJson;
else if (m_args.count(g_strAssemble) > 0 || m_args.count(g_strStrictAssembly) > 0 || m_args.count(g_strYul) > 0)
m_options.input.mode = InputMode::Assembler;
else if (m_args.count(g_strLink) > 0)
m_options.input.mode = InputMode::Linker;
else if (m_args.count(g_strImportAst) > 0)
m_options.input.mode = InputMode::CompilerWithASTImport;
else
m_options.input.mode = InputMode::Compiler;
if (m_options.input.mode == InputMode::StandardJson)
{
vector<string> inputFiles; vector<string> inputFiles;
if (m_args.count(g_strInputFile)) if (m_args.count(g_strInputFile))
inputFiles = m_args[g_strInputFile].as<vector<string>>(); inputFiles = m_args[g_strInputFile].as<vector<string>>();
@ -909,10 +918,8 @@ General Information)").c_str(),
m_options.output.evmVersion = *versionOption; m_options.output.evmVersion = *versionOption;
} }
if (m_args.count(g_strAssemble) || m_args.count(g_strStrictAssembly) || m_args.count(g_strYul)) if (m_options.input.mode == InputMode::Assembler)
{ {
m_options.input.mode = InputMode::Assembler;
vector<string> const nonAssemblyModeOptions = { vector<string> const nonAssemblyModeOptions = {
// TODO: The list is not complete. Add more. // TODO: The list is not complete. Add more.
g_strOutputDir, g_strOutputDir,
@ -1026,11 +1033,8 @@ General Information)").c_str(),
return false; return false;
} }
if (m_args.count(g_strLink)) if (m_options.input.mode == InputMode::Linker)
{
m_options.input.mode = InputMode::Linker;
return true; return true;
}
if (m_args.count(g_strMetadataHash)) if (m_args.count(g_strMetadataHash))
{ {
@ -1123,9 +1127,7 @@ General Information)").c_str(),
m_options.optimizer.yulSteps = m_args[g_strYulOptimizations].as<string>(); m_options.optimizer.yulSteps = m_args[g_strYulOptimizations].as<string>();
} }
if (m_args.count(g_strImportAst) > 0) if (m_options.input.mode == InputMode::Compiler)
m_options.input.mode = InputMode::CompilerWithASTImport;
else
m_options.input.errorRecovery = (m_args.count(g_strErrorRecovery) > 0); m_options.input.errorRecovery = (m_args.count(g_strErrorRecovery) > 0);
solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, ""); solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");