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

Switch to new error reporter.

Browse Source
This commit is contained in:
Daniel Kirchner 2019-09-06 11:27:06 +02:00
parent ea0a952a69
commit 90d5c98272
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -3,6 +3,7 @@
Breaking changes: Breaking changes:
* General: Disallow explicit conversions from external function types to ``address`` and add a member called ``address`` to them as replacement. * General: Disallow explicit conversions from external function types to ``address`` and add a member called ``address`` to them as replacement.
* Type checker: Resulting type of exponentiation is equal to the type of the base. Also allow signed types for the base. * Type checker: Resulting type of exponentiation is equal to the type of the base. Also allow signed types for the base.
* Command line interface: Switch to the new error reporter by default. ``--old-reporter`` falls back to the deprecated old error reporter.
Language Features: Language Features:

18
solc/CommandLineInterface.cpp
View File

@ -150,7 +150,7 @@ static string const g_strVersion = "version";
static string const g_strIgnoreMissingFiles = "ignore-missing"; static string const g_strIgnoreMissingFiles = "ignore-missing";
static string const g_strColor = "color"; static string const g_strColor = "color";
static string const g_strNoColor = "no-color"; static string const g_strNoColor = "no-color";
static string const g_strNewReporter = "new-reporter"; static string const g_strOldReporter = "old-reporter";
static string const g_argAbi = g_strAbi; static string const g_argAbi = g_strAbi;
static string const g_argPrettyJson = g_strPrettyJson; static string const g_argPrettyJson = g_strPrettyJson;
@ -191,7 +191,7 @@ static string const g_stdinFileName = g_stdinFileNameStr;
static string const g_argIgnoreMissingFiles = g_strIgnoreMissingFiles; static string const g_argIgnoreMissingFiles = g_strIgnoreMissingFiles;
static string const g_argColor = g_strColor; static string const g_argColor = g_strColor;
static string const g_argNoColor = g_strNoColor; static string const g_argNoColor = g_strNoColor;
static string const g_argNewReporter = g_strNewReporter; static string const g_argOldReporter = g_strOldReporter;
/// Possible arguments to for --combined-json /// Possible arguments to for --combined-json
static set<string> const g_combinedJsonArgs static set<string> const g_combinedJsonArgs
@ -706,7 +706,7 @@ Allowed options)",
) )
(g_argColor.c_str(), "Force colored output.") (g_argColor.c_str(), "Force colored output.")
(g_argNoColor.c_str(), "Explicitly disable colored output, disabling terminal auto-detection.") (g_argNoColor.c_str(), "Explicitly disable colored output, disabling terminal auto-detection.")
(g_argNewReporter.c_str(), "Enables new diagnostics reporter.") (g_argOldReporter.c_str(), "Enables old diagnostics reporter.")
(g_argErrorRecovery.c_str(), "Enables additional parser error recovery.") (g_argErrorRecovery.c_str(), "Enables additional parser error recovery.")
(g_argIgnoreMissingFiles.c_str(), "Ignore missing files."); (g_argIgnoreMissingFiles.c_str(), "Ignore missing files.");
po::options_description outputComponents("Output Components"); po::options_description outputComponents("Output Components");
@ -929,10 +929,10 @@ bool CommandLineInterface::processInput()
m_compiler.reset(new CompilerStack(fileReader)); m_compiler.reset(new CompilerStack(fileReader));
unique_ptr<SourceReferenceFormatter> formatter; unique_ptr<SourceReferenceFormatter> formatter;
if (m_args.count(g_argNewReporter)) if (m_args.count(g_argOldReporter))
formatter = make_unique<SourceReferenceFormatterHuman>(serr(false), m_coloredOutput);
else
formatter = make_unique<SourceReferenceFormatter>(serr(false)); formatter = make_unique<SourceReferenceFormatter>(serr(false));
else
formatter = make_unique<SourceReferenceFormatterHuman>(serr(false), m_coloredOutput);
try try
{ {
@ -1325,10 +1325,10 @@ bool CommandLineInterface::assemble(
{ {
auto const& stack = sourceAndStack.second; auto const& stack = sourceAndStack.second;
unique_ptr<SourceReferenceFormatter> formatter; unique_ptr<SourceReferenceFormatter> formatter;
if (m_args.count(g_argNewReporter)) if (m_args.count(g_argOldReporter))
formatter = make_unique<SourceReferenceFormatterHuman>(serr(false), m_coloredOutput);
else
formatter = make_unique<SourceReferenceFormatter>(serr(false)); formatter = make_unique<SourceReferenceFormatter>(serr(false));
else
formatter = make_unique<SourceReferenceFormatterHuman>(serr(false), m_coloredOutput);
for (auto const& error: stack.errors()) for (auto const& error: stack.errors())
{ {