aboutsummaryrefslogtreecommitdiffstats
path: root/vm.cpp
diff options
context:
space:
mode:
authorChristoph Jentzsch <jentzsch.software@gmail.com>2014-10-02 20:20:33 +0800
committerChristoph Jentzsch <jentzsch.software@gmail.com>2014-10-02 20:20:33 +0800
commitd490d3197bf55a693f0043bd817475f137ba5f82 (patch)
tree79267ed23dad7af8476660b08bfd36ba1d333ba5 /vm.cpp
parent8b3b711efff286d5ff409843c802c001a66fe3c7 (diff)
downloaddexon-solidity-d490d3197bf55a693f0043bd817475f137ba5f82.tar
dexon-solidity-d490d3197bf55a693f0043bd817475f137ba5f82.tar.gz
dexon-solidity-d490d3197bf55a693f0043bd817475f137ba5f82.tar.bz2
dexon-solidity-d490d3197bf55a693f0043bd817475f137ba5f82.tar.lz
dexon-solidity-d490d3197bf55a693f0043bd817475f137ba5f82.tar.xz
dexon-solidity-d490d3197bf55a693f0043bd817475f137ba5f82.tar.zst
dexon-solidity-d490d3197bf55a693f0043bd817475f137ba5f82.zip
Restructured exceptions. Boost::exception is now used primarily.
Diffstat (limited to 'vm.cpp')
-rw-r--r--vm.cpp25
1 files changed, 19 insertions, 6 deletions
diff --git a/vm.cpp b/vm.cpp
index f2f30e23..96eeb4d1 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -435,9 +435,14 @@ void doTests(json_spirit::mValue& v, bool _fillin)
{
output = vm.go(fev).toBytes();
}
- catch (std::exception const& e)
+ catch (Exception const& _e)
{
- cnote << "VM did throw an exception: " << e.what();
+ cnote << "VM did throw an exception: " << diagnostic_information(_e);
+ //BOOST_ERROR("Failed VM Test with Exception: " << e.what());
+ }
+ catch (std::exception const& _e)
+ {
+ cnote << "VM did throw an exception: " << _e.what();
//BOOST_ERROR("Failed VM Test with Exception: " << e.what());
}
@@ -537,9 +542,13 @@ void executeTests(const string& _name)
dev::test::doTests(v, true);
writeFile("../../../tests/" + _name + ".json", asBytes(json_spirit::write_string(v, true)));
}
- catch (std::exception const& e)
+ catch (Exception const& _e)
{
- BOOST_ERROR("Failed VM Test with Exception: " << e.what());
+ BOOST_ERROR("Failed VM Test with Exception: " << diagnostic_information(_e));
+ }
+ catch (std::exception const& _e)
+ {
+ BOOST_ERROR("Failed VM Test with Exception: " << _e.what());
}
#endif
@@ -552,9 +561,13 @@ void executeTests(const string& _name)
json_spirit::read_string(s, v);
dev::test::doTests(v, false);
}
- catch (std::exception const& e)
+ catch (Exception const& _e)
+ {
+ BOOST_ERROR("Failed VM Test with Exception: " << diagnostic_information(_e));
+ }
+ catch (std::exception const& _e)
{
- BOOST_ERROR("Failed VM Test with Exception: " << e.what());
+ BOOST_ERROR("Failed VM Test with Exception: " << _e.what());
}
}