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

Remove --old-reporter from solc

Browse Source
This commit is contained in:
Alex Beregszaszi
2020-12-01 16:09:46 +01:00
committed by chriseth
parent edfae1ed05
commit 1126838a31
2 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
solc/CommandLineInterface.cpp
+7 -22
View File
@@ -45,7 +45,6 @@
#include <liblangutil/Exceptions.h>
#include <liblangutil/Scanner.h>
#include <liblangutil/SourceReferenceFormatter.h>
#include <liblangutil/SourceReferenceFormatterHuman.h>
#include <libsmtutil/Exceptions.h>
@@ -189,7 +188,6 @@ static string const g_strIgnoreMissingFiles = "ignore-missing";
static string const g_strColor = "color";
static string const g_strNoColor = "no-color";
static string const g_strErrorIds = "error-codes";
static string const g_strOldReporter = "old-reporter";
static string const g_argAbi = g_strAbi;
static string const g_argPrettyJson = g_strPrettyJson;
@@ -238,7 +236,6 @@ static string const g_argIgnoreMissingFiles = g_strIgnoreMissingFiles;
static string const g_argColor = g_strColor;
static string const g_argNoColor = g_strNoColor;
static string const g_argErrorIds = g_strErrorIds;
static string const g_argOldReporter = g_strOldReporter;
/// Possible arguments to for --combined-json
static set<string> const g_combinedJsonArgs
@@ -939,10 +936,6 @@ General Information)").c_str(),
g_argErrorIds.c_str(),
"Output error codes."
)
(
g_argOldReporter.c_str(),
"Enables old diagnostics reporter (legacy option, will be removed)."
)
;
desc.add(outputFormatting);
@@ -1454,11 +1447,7 @@ bool CommandLineInterface::processInput()
m_compiler = make_unique<CompilerStack>(fileReader);
unique_ptr<SourceReferenceFormatter> formatter;
if (m_args.count(g_argOldReporter))
formatter = make_unique<SourceReferenceFormatter>(serr(false));
else
formatter = make_unique<SourceReferenceFormatterHuman>(serr(false), m_coloredOutput, m_withErrorIds);
SourceReferenceFormatterHuman formatter(serr(false), m_coloredOutput, m_withErrorIds);
try
{
@@ -1518,7 +1507,7 @@ bool CommandLineInterface::processInput()
if (!m_compiler->analyze())
{
for (auto const& error: m_compiler->errors())
formatter->printErrorInformation(*error);
formatter.printErrorInformation(*error);
astAssert(false, "Analysis of the AST failed");
}
}
@@ -1540,7 +1529,7 @@ bool CommandLineInterface::processInput()
for (auto const& error: m_compiler->errors())
{
g_hasOutput = true;
formatter->printErrorInformation(*error);
formatter.printErrorInformation(*error);
}
if (!successful)
@@ -1554,7 +1543,7 @@ bool CommandLineInterface::processInput()
catch (CompilerError const& _exception)
{
g_hasOutput = true;
formatter->printExceptionInformation(_exception, "Compiler error");
formatter.printExceptionInformation(_exception, "Compiler error");
return false;
}
catch (InternalCompilerError const& _exception)
@@ -1588,7 +1577,7 @@ bool CommandLineInterface::processInput()
else
{
g_hasOutput = true;
formatter->printExceptionInformation(_error, _error.typeName());
formatter.printExceptionInformation(_error, _error.typeName());
}
return false;
@@ -1883,16 +1872,12 @@ bool CommandLineInterface::assemble(
for (auto const& sourceAndStack: assemblyStacks)
{
auto const& stack = sourceAndStack.second;
unique_ptr<SourceReferenceFormatter> formatter;
if (m_args.count(g_argOldReporter))
formatter = make_unique<SourceReferenceFormatter>(serr(false));
else
formatter = make_unique<SourceReferenceFormatterHuman>(serr(false), m_coloredOutput, m_withErrorIds);
SourceReferenceFormatterHuman formatter(serr(false), m_coloredOutput, m_withErrorIds);
for (auto const& error: stack.errors())
{
g_hasOutput = true;
formatter->printErrorInformation(*error);
formatter.printErrorInformation(*error);
}
if (!Error::containsOnlyWarnings(stack.errors()))
successful = false;