Converted all asserts to exceptions.

1 files changed, 27 insertions, 18 deletions

diff --git a/main.cpp b/main.cpp
index 1cf466c7..04fee290 100644
--- a/main.cpp
+++ b/main.cpp
@@ -84,21 +84,27 @@ int main(int argc, char** argv)
 	ASTPointer<ContractDefinition> ast;
 	shared_ptr<Scanner> scanner = make_shared<Scanner>(CharStream(sourceCode));
 	Parser parser;
+	bytes instructions;
+	Compiler compiler;
 	try
 	{
 		ast = parser.parse(scanner);
+
+		NameAndTypeResolver resolver;
+		resolver.resolveNamesAndTypes(*ast.get());
+
+		cout << "Syntax tree for the contract:" << endl;
+		dev::solidity::ASTPrinter printer(ast, sourceCode);
+		printer.print(cout);
+
+		compiler.compileContract(*ast);
+		instructions = compiler.getAssembledBytecode();
 	}
 	catch (ParserError const& exception)
 	{
 		SourceReferenceFormatter::printExceptionInformation(cerr, exception, "Parser error", *scanner);
 		return -1;
 	}
-
-	NameAndTypeResolver resolver;
-	try
-	{
-		resolver.resolveNamesAndTypes(*ast.get());
-	}
 	catch (DeclarationError const& exception)
 	{
 		SourceReferenceFormatter::printExceptionInformation(cerr, exception, "Declaration error", *scanner);
@@ -109,23 +115,26 @@ int main(int argc, char** argv)
 		SourceReferenceFormatter::printExceptionInformation(cerr, exception, "Type error", *scanner);
 		return -1;
 	}
-
-	cout << "Syntax tree for the contract:" << endl;
-	dev::solidity::ASTPrinter printer(ast, sourceCode);
-	printer.print(cout);
-
-	bytes instructions;
-	Compiler compiler;
-	try
-	{
-		compiler.compileContract(*ast);
-		instructions = compiler.getAssembledBytecode();
-	}
 	catch (CompilerError const& exception)
 	{
 		SourceReferenceFormatter::printExceptionInformation(cerr, exception, "Compiler error", *scanner);
 		return -1;
 	}
+	catch (InternalCompilerError const& exception)
+	{
+		cerr << "Internal compiler error: " << boost::diagnostic_information(exception) << endl;
+		return -1;
+	}
+	catch (Exception const& exception)
+	{
+		cerr << "Exception during compilation: " << boost::diagnostic_information(exception) << endl;
+		return -1;
+	}
+	catch (...)
+	{
+		cerr << "Unknown exception during compilation." << endl;
+		return -1;
+	}
 
 	cout << "EVM assembly:" << endl;
 	compiler.streamAssembly(cout);