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

Use boost errinfo.

Browse Source
This commit is contained in:
Christian 2014-10-23 19:22:30 +02:00
parent 892f15cd9f
commit fa256b7f95
1 changed files with 7 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
main.cpp
View File

@ -10,6 +10,7 @@
#include <libsolidity/ASTPrinter.h> #include <libsolidity/ASTPrinter.h>
#include <libsolidity/NameAndTypeResolver.h> #include <libsolidity/NameAndTypeResolver.h>
#include <libsolidity/Exceptions.h> #include <libsolidity/Exceptions.h>
#include <libsolidity/SourceReferenceFormatter.h>
using namespace dev; using namespace dev;
using namespace solidity; using namespace solidity;
@ -33,33 +34,6 @@ void version()
exit(0); exit(0);
} }
void printSourcePart(std::ostream& _stream, Location const& _location, Scanner const& _scanner)
{
int startLine;
int startColumn;
std::tie(startLine, startColumn) = _scanner.translatePositionToLineColumn(_location.start);
_stream << " starting at line " << (startLine + 1) << ", column " << (startColumn + 1) << "\n";
int endLine;
int endColumn;
std::tie(endLine, endColumn) = _scanner.translatePositionToLineColumn(_location.end);
if (startLine == endLine)
{
_stream << _scanner.getLineAtPosition(_location.start) << "\n"
<< std::string(startColumn, ' ') << "^";
if (endColumn > startColumn + 2)
_stream << std::string(endColumn - startColumn - 2, '-');
if (endColumn > startColumn + 1)
_stream << "^";
_stream << "\n";
}
else
{
_stream << _scanner.getLineAtPosition(_location.start) << "\n"
<< std::string(startColumn, ' ') << "^\n"
<< "Spanning multiple lines.\n";
}
}
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
std::string infile; std::string infile;
@ -93,14 +67,9 @@ int main(int argc, char** argv)
{ {
ast = parser.parse(scanner); ast = parser.parse(scanner);
} }
catch (ParserError const& exc) catch (ParserError const& exception)
{ {
int line; SourceReferenceFormatter::printExceptionInformation(std::cerr, exception, "Parser error", *scanner);
int column;
std::tie(line, column) = scanner->translatePositionToLineColumn(exc.getPosition());
std::cerr << exc.what() << " at line " << (line + 1) << ", column " << (column + 1) << std::endl;
std::cerr << scanner->getLineAtPosition(exc.getPosition()) << std::endl;
std::cerr << std::string(column, ' ') << "^" << std::endl;
return -1; return -1;
} }
@ -109,16 +78,14 @@ int main(int argc, char** argv)
{ {
resolver.resolveNamesAndTypes(*ast.get()); resolver.resolveNamesAndTypes(*ast.get());
} }
catch (DeclarationError const& exc) catch (DeclarationError const& exception)
{ {
std::cerr << exc.what() << std::endl; SourceReferenceFormatter::printExceptionInformation(std::cerr, exception, "Declaration error", *scanner);
printSourcePart(std::cerr, exc.getLocation(), *scanner);
return -1; return -1;
} }
catch (TypeError const& exc) catch (TypeError const& exception)
{ {
std::cerr << exc.what() << std::endl; SourceReferenceFormatter::printExceptionInformation(std::cerr, exception, "Type error", *scanner);
printSourcePart(std::cerr, exc.getLocation(), *scanner);
return -1; return -1;
} }