diff options
| author | Lefteris Karapetsas <lefteris@refu.co> | 2015-01-20 01:58:09 +0800 |
|---|---|---|
| committer | Lefteris Karapetsas <lefteris@refu.co> | 2015-01-20 03:12:48 +0800 |
| commit | 02521a164ce8fc49d6d4af584da127098c59ba2f (patch) | |
| tree | 4919438f89b8d001542a45f149e4920aff3c7228 | |
| parent | ab4178941b1f1d99bf266cd0a27d79a27162513a (diff) | |
| download | dexon-solidity-02521a164ce8fc49d6d4af584da127098c59ba2f.tar.gz dexon-solidity-02521a164ce8fc49d6d4af584da127098c59ba2f.tar.zst dexon-solidity-02521a164ce8fc49d6d4af584da127098c59ba2f.zip | |
Improved handling of exceptions in some Solidity Tests
| -rw-r--r-- | SolidityABIJSON.cpp | 8 | ||||
| -rw-r--r-- | SolidityNatspecJSON.cpp | 8 | ||||
| -rw-r--r-- | solidityExecutionFramework.h | 8 |
3 files changed, 6 insertions, 18 deletions
diff --git a/SolidityABIJSON.cpp b/SolidityABIJSON.cpp index d553f576..892b71f1 100644 --- a/SolidityABIJSON.cpp +++ b/SolidityABIJSON.cpp @@ -41,13 +41,9 @@ public: { m_compilerStack.parse(_code); } - catch (const std::exception& e) + catch(boost::exception const& _e) { - std::string const* extra = boost::get_error_info<errinfo_comment>(e); - std::string msg = std::string("Parsing contract failed with: ") + - e.what() + std::string("\n"); - if (extra) - msg += *extra; + auto msg = std::string("Parsing contract failed with: ") + boost::diagnostic_information(_e); BOOST_FAIL(msg); } std::string generatedInterfaceString = m_compilerStack.getMetadata("", DocumentationType::ABI_INTERFACE); diff --git a/SolidityNatspecJSON.cpp b/SolidityNatspecJSON.cpp index d43aebc2..5cec0444 100644 --- a/SolidityNatspecJSON.cpp +++ b/SolidityNatspecJSON.cpp @@ -45,13 +45,9 @@ public: { m_compilerStack.parse(_code); } - catch (const std::exception& e) + catch(boost::exception const& _e) { - std::string const* extra = boost::get_error_info<errinfo_comment>(e); - std::string msg = std::string("Parsing contract failed with: ") + - e.what() + std::string("\n"); - if (extra) - msg += *extra; + auto msg = std::string("Parsing contract failed with: ") + boost::diagnostic_information(_e); BOOST_FAIL(msg); } diff --git a/solidityExecutionFramework.h b/solidityExecutionFramework.h index 1aea61fe..271a594c 100644 --- a/solidityExecutionFramework.h +++ b/solidityExecutionFramework.h @@ -50,13 +50,9 @@ public: { compiler.compile(_sourceCode, m_optimize); } - catch (const std::exception& e) + catch(boost::exception const& _e) { - std::string const* extra = boost::get_error_info<errinfo_comment>(e); - std::string msg = std::string("Parsing contract failed with: ") + - e.what() + std::string("\n"); - if (extra) - msg += *extra; + auto msg = std::string("Compiling contract failed with: ") + boost::diagnostic_information(_e); BOOST_FAIL(msg); } |