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/CommandLineInterface.cpp
+50 -45
View File
@@ -377,8 +377,18 @@ void CommandLineInterface::handleGasEstimation(string const& _contract)
}
}
bool CommandLineInterface::readInputFilesAndConfigureFileReader()
bool CommandLineInterface::readInputFiles()
{
solAssert(!m_standardJsonInput.has_value(), "");
m_fileReader.setBasePath(m_options.input.basePath);
if (m_fileReader.basePath() != "" && !boost::filesystem::is_directory(m_fileReader.basePath()))
{
serr() << "Base path must be a directory: " << m_fileReader.basePath() << endl;
return false;
}
for (boost::filesystem::path const& allowedDirectory: m_options.input.allowedDirectories)
m_fileReader.allowDirectory(allowedDirectory);
@@ -411,16 +421,33 @@ bool CommandLineInterface::readInputFilesAndConfigureFileReader()
}
// NOTE: we ignore the FileNotFound exception as we manually check above
m_fileReader.setSource(infile, readFileAsString(infile.string()));
m_fileReader.allowDirectory(boost::filesystem::path(boost::filesystem::canonical(infile).string()).remove_filename());
string fileContent = readFileAsString(infile.string());
if (m_options.input.mode == InputMode::StandardJson)
{
solAssert(!m_standardJsonInput.has_value(), "");
m_standardJsonInput = move(fileContent);
}
else
{
m_fileReader.setSource(infile, move(fileContent));
m_fileReader.allowDirectory(boost::filesystem::canonical(infile).remove_filename());
}
}
if (m_options.input.addStdin)
m_fileReader.setSource(g_stdinFileName, readUntilEnd(m_sin));
if (m_fileReader.sourceCodes().size() == 0)
{
serr() << "No input files given. If you wish to use the standard input please specify \"-\" explicitly." << endl;
if (m_options.input.mode == InputMode::StandardJson)
{
solAssert(!m_standardJsonInput.has_value(), "");
m_standardJsonInput = readUntilEnd(m_sin);
}
else
m_fileReader.setSource(g_stdinFileName, readUntilEnd(m_sin));
}
if (m_fileReader.sourceCodes().empty() && !m_standardJsonInput.has_value())
{
serr() << "All specified input files either do not exist or are not regular files." << endl;
return false;
}
@@ -502,57 +529,35 @@ bool CommandLineInterface::parseArguments(int _argc, char const* const* _argv)
bool CommandLineInterface::processInput()
{
m_fileReader.setBasePath(m_options.input.basePath);
if (m_options.input.basePath != "" && !boost::filesystem::is_directory(m_options.input.basePath))
switch (m_options.input.mode)
{
serr() << "Base path must be a directory: \"" << m_options.input.basePath << "\"\n";
return false;
}
if (m_options.input.mode == InputMode::StandardJson)
case InputMode::StandardJson:
{
string input;
if (m_options.input.standardJsonFile.empty())
input = readUntilEnd(m_sin);
else
{
try
{
input = readFileAsString(m_options.input.standardJsonFile);
}
catch (FileNotFound const&)
{
serr() << "File not found: " << m_options.input.standardJsonFile << endl;
return false;
}
catch (NotAFile const&)
{
serr() << "Not a regular file: " << m_options.input.standardJsonFile << endl;
return false;
}
}
solAssert(m_standardJsonInput.has_value(), "");
StandardCompiler compiler(m_fileReader.reader(), m_options.formatting.json);
sout() << compiler.compile(std::move(input)) << endl;
sout() << compiler.compile(move(m_standardJsonInput.value())) << endl;
m_standardJsonInput.reset();
return true;
}
if (!readInputFilesAndConfigureFileReader())
return false;
if (m_options.input.mode == InputMode::Assembler)
case InputMode::Assembler:
{
return assemble(
m_options.assembly.inputLanguage,
m_options.assembly.targetMachine,
m_options.optimizer.enabled,
m_options.optimizer.yulSteps
);
if (m_options.input.mode == InputMode::Linker)
}
case InputMode::Linker:
return link();
case InputMode::Compiler:
case InputMode::CompilerWithASTImport:
return compile();
}
solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
return compile();
solAssert(false, "");
return false;
}
bool CommandLineInterface::compile()