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

Merge pull request #1610 from ethereum/assemblyModeError

Browse Source 
Proper error reporting for assembly mode.
This commit is contained in:
Alex Beregszaszi 2017-01-26 14:41:39 +00:00 committed by GitHub
commit 024061b828
2 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
solc/CommandLineInterface.cpp
View File

@ -22,28 +22,8 @@
*/ */
#include "CommandLineInterface.h" #include "CommandLineInterface.h"
#ifdef _WIN32 // windows
#include <io.h>
#define isatty _isatty
#define fileno _fileno
#else // unix
#include <unistd.h>
#endif
#include <string>
#include <iostream>
#include <fstream>
#include <boost/filesystem.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/algorithm/string.hpp>
#include "solidity/BuildInfo.h" #include "solidity/BuildInfo.h"
#include <libdevcore/Common.h>
#include <libdevcore/CommonData.h>
#include <libdevcore/CommonIO.h>
#include <libdevcore/JSON.h>
#include <libevmasm/Instruction.h>
#include <libevmasm/GasMeter.h>
#include <libsolidity/interface/Version.h> #include <libsolidity/interface/Version.h>
#include <libsolidity/parsing/Scanner.h> #include <libsolidity/parsing/Scanner.h>
#include <libsolidity/parsing/Parser.h> #include <libsolidity/parsing/Parser.h>
@ -54,9 +34,31 @@
#include <libsolidity/interface/CompilerStack.h> #include <libsolidity/interface/CompilerStack.h>
#include <libsolidity/interface/SourceReferenceFormatter.h> #include <libsolidity/interface/SourceReferenceFormatter.h>
#include <libsolidity/interface/GasEstimator.h> #include <libsolidity/interface/GasEstimator.h>
#include <libsolidity/inlineasm/AsmParser.h>
#include <libsolidity/formal/Why3Translator.h> #include <libsolidity/formal/Why3Translator.h>
#include <libevmasm/Instruction.h>
#include <libevmasm/GasMeter.h>
#include <libdevcore/Common.h>
#include <libdevcore/CommonData.h>
#include <libdevcore/CommonIO.h>
#include <libdevcore/JSON.h>
#include <boost/filesystem.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/algorithm/string.hpp>
#ifdef _WIN32 // windows
#include <io.h>
#define isatty _isatty
#define fileno _fileno
#else // unix
#include <unistd.h>
#endif
#include <string>
#include <iostream>
#include <fstream>
using namespace std; using namespace std;
namespace po = boost::program_options; namespace po = boost::program_options;
@ -912,7 +914,6 @@ void CommandLineInterface::writeLinkedFiles()
bool CommandLineInterface::assemble() bool CommandLineInterface::assemble()
{ {
//@TODO later, we will use the convenience interface and should also remove the include above
bool successful = true; bool successful = true;
map<string, shared_ptr<Scanner>> scanners; map<string, shared_ptr<Scanner>> scanners;
for (auto const& src: m_sourceCodes) for (auto const& src: m_sourceCodes)
@ -926,6 +927,7 @@ bool CommandLineInterface::assemble()
m_assemblyStacks[src.first].assemble(); m_assemblyStacks[src.first].assemble();
} }
for (auto const& stack: m_assemblyStacks) for (auto const& stack: m_assemblyStacks)
{
for (auto const& error: stack.second.errors()) for (auto const& error: stack.second.errors())
SourceReferenceFormatter::printExceptionInformation( SourceReferenceFormatter::printExceptionInformation(
cerr, cerr,
@ -933,6 +935,9 @@ bool CommandLineInterface::assemble()
(error->type() == Error::Type::Warning) ? "Warning" : "Error", (error->type() == Error::Type::Warning) ? "Warning" : "Error",
[&](string const& _source) -> Scanner const& { return *scanners.at(_source); } [&](string const& _source) -> Scanner const& { return *scanners.at(_source); }
); );
if (!Error::containsOnlyWarnings(stack.second.errors()))
successful = false;
}
return successful; return successful;
} }

8
solc/CommandLineInterface.h
View File

@ -21,12 +21,14 @@
*/ */
#pragma once #pragma once
#include <memory>
#include <boost/program_options.hpp>
#include <boost/filesystem/path.hpp>
#include <libsolidity/interface/CompilerStack.h> #include <libsolidity/interface/CompilerStack.h>
#include <libsolidity/inlineasm/AsmStack.h> #include <libsolidity/inlineasm/AsmStack.h>
#include <boost/program_options.hpp>
#include <boost/filesystem/path.hpp>
#include <memory>
namespace dev namespace dev
{ {
namespace solidity namespace solidity