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

Process input files in Standard JSON mode just like in other modes

Browse Source 
- This makes `-` for stdin work.
- `--ignore-missing` now works with `--standard-json`, though it's not very useful because there can be at most one input file.
- Separate errors for situations where there are no input files on the command line (this can be detected in the parser) and where they are not present on disk.
This commit is contained in:
Kamil Śliwak
2021-07-27 15:54:32 +02:00
parent c938f35b99
commit 9a7c364c71
16 changed files with 583 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
solc/CommandLineParser.cpp
+30 -17
View File
@@ -265,7 +265,6 @@ bool CommandLineOptions::operator==(CommandLineOptions const& _other) const noex
{
return
input.paths == _other.input.paths &&
input.standardJsonFile == _other.input.standardJsonFile &&
input.remappings == _other.input.remappings &&
input.addStdin == _other.input.addStdin &&
input.basePath == _other.input.basePath &&
@@ -301,12 +300,20 @@ bool CommandLineOptions::operator==(CommandLineOptions const& _other) const noex
bool CommandLineParser::parseInputPathsAndRemappings()
{
m_options.input.ignoreMissingFiles = (m_args.count(g_strIgnoreMissingFiles) > 0);
if (m_args.count(g_strInputFile))
for (string path: m_args[g_strInputFile].as<vector<string>>())
{
auto eq = find(path.begin(), path.end(), '=');
if (eq != path.end())
{
if (m_options.input.mode == InputMode::StandardJson)
{
serr() << "Import remappings are not accepted on the command line in Standard JSON mode." << endl;
serr() << "Please put them under 'settings.remappings' in the JSON input." << endl;
return false;
}
if (auto r = ImportRemapper::parseRemapping(path))
m_options.input.remappings.emplace_back(std::move(*r));
else
@@ -324,6 +331,25 @@ bool CommandLineParser::parseInputPathsAndRemappings()
m_options.input.paths.insert(path);
}
if (m_options.input.mode == InputMode::StandardJson)
{
if (m_options.input.paths.size() > 1 || (m_options.input.paths.size() == 1 && m_options.input.addStdin))
{
serr() << "Too many input files for --" << g_strStandardJSON << "." << endl;
serr() << "Please either specify a single file name or provide its content on standard input." << endl;
return false;
}
else if (m_options.input.paths.size() == 0)
// Standard JSON mode input used to be handled separately and zero files meant "read from stdin".
// Keep it working that way for backwards-compatibility.
m_options.input.addStdin = true;
}
else if (m_options.input.paths.size() == 0 && !m_options.input.addStdin)
{
serr() << "No input files given. If you wish to use the standard input please specify \"-\" explicitly." << endl;
return false;
}
return true;
}
@@ -882,25 +908,12 @@ General Information)").c_str(),
else
m_options.input.mode = InputMode::Compiler;
if (m_options.input.mode == InputMode::StandardJson)
{
vector<string> inputFiles;
if (m_args.count(g_strInputFile))
inputFiles = m_args[g_strInputFile].as<vector<string>>();
if (inputFiles.size() == 1)
m_options.input.standardJsonFile = inputFiles[0];
else if (inputFiles.size() > 1)
{
serr() << "If --" << g_strStandardJSON << " is used, only zero or one input files are supported." << endl;
return false;
}
return true;
}
if (!parseInputPathsAndRemappings())
return false;
if (m_options.input.mode == InputMode::StandardJson)
return true;
if (m_args.count(g_strLibraries))
for (string const& library: m_args[g_strLibraries].as<vector<string>>())
if (!parseLibraryOption(library))