Merge pull request #410 from chriseth/sol_exceptions

Improved exceptions and reporting exceptions for command-line compiler.

1 files changed, 7 insertions, 3 deletions

diff --git a/AST.h b/AST.h
index d5e1e066..df146ab1 100644
--- a/AST.h
+++ b/AST.h
@@ -22,16 +22,16 @@
 
 #pragma once
 
-#include <boost/noncopyable.hpp>
 
 #include <string>
 #include <vector>
 #include <memory>
-
+#include <boost/noncopyable.hpp>
 #include <libsolidity/ASTForward.h>
 #include <libsolidity/BaseTypes.h>
 #include <libsolidity/Token.h>
 #include <libsolidity/Types.h>
+#include <libsolidity/Exceptions.h>
 
 namespace dev
 {
@@ -57,6 +57,10 @@ public:
 
 	Location const& getLocation() const { return m_location; }
 
+	/// Creates a @ref TypeError exception and decorates it with the location of the node and
+	/// the given description
+	TypeError createTypeError(std::string const& _description);
+
 private:
 	Location m_location;
 };
@@ -165,7 +169,7 @@ public:
 		Declaration(_location, _name), m_typeName(_type) {}
 	virtual void accept(ASTVisitor& _visitor) override;
 
-	bool isTypeGivenExplicitly() const { return m_typeName.get() != nullptr; }
+	bool isTypeGivenExplicitly() const { return bool(m_typeName); }
 	TypeName* getTypeName() const { return m_typeName.get(); }
 
 	//! Returns the declared or inferred type. Can be an empty pointer if no type was explicitly