generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only apply divide by zero protection to integers

Browse Source 
Also allow arithmetic error to bubble up to the caller.
This commit is contained in:
Jason Turner
2015-01-09 20:06:04 -07:00
parent 8746a9eea5
commit 25b15a3449
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/chaiscript/dispatchkit/bootstrap.hpp
View File

@@ -396,10 +396,9 @@ namespace chaiscript
m->add(user_type<std::runtime_error>(), "runtime_error"); m->add(user_type<std::runtime_error>(), "runtime_error");
m->add(chaiscript::base_class<std::exception, std::runtime_error>()); m->add(chaiscript::base_class<std::exception, std::runtime_error>());
m->add(constructor<std::runtime_error (const std::string &)>(), "runtime_error"); m->add(constructor<std::runtime_error (const std::string &)>(), "runtime_error");
m->add(fun(std::function<std::string (const std::runtime_error &)>(&what)), "what"); m->add(fun(std::function<std::string (const std::runtime_error &)>(&what)), "what");
m->add(user_type<dispatch::Dynamic_Object>(), "Dynamic_Object"); m->add(user_type<dispatch::Dynamic_Object>(), "Dynamic_Object");
m->add(constructor<dispatch::Dynamic_Object (const std::string &)>(), "Dynamic_Object"); m->add(constructor<dispatch::Dynamic_Object (const std::string &)>(), "Dynamic_Object");
@@ -487,7 +486,12 @@ namespace chaiscript
m->add(chaiscript::fun(&has_parse_tree), "has_parse_tree"); m->add(chaiscript::fun(&has_parse_tree), "has_parse_tree");
m->add(chaiscript::fun(&get_parse_tree), "get_parse_tree"); m->add(chaiscript::fun(&get_parse_tree), "get_parse_tree");
m->add(chaiscript::base_class<std::exception, chaiscript::exception::eval_error>()); m->add(chaiscript::user_type<chaiscript::exception::eval_error>("eval_error"));
m->add(chaiscript::base_class<std::runtime_error, chaiscript::exception::eval_error>());
m->add(chaiscript::user_type<chaiscript::exception::arithmetic_error>("arithmetic_error"));
m->add(chaiscript::base_class<std::runtime_error, chaiscript::exception::arithmetic_error>());
// chaiscript::bootstrap::standard_library::vector_type<std::vector<std::shared_ptr<chaiscript::AST_Node> > >("AST_NodeVector", m); // chaiscript::bootstrap::standard_library::vector_type<std::vector<std::shared_ptr<chaiscript::AST_Node> > >("AST_NodeVector", m);

4
include/chaiscript/dispatchkit/boxed_number.hpp
View File

@@ -53,7 +53,9 @@ namespace chaiscript
template<typename T> template<typename T>
static void check_divide_by_zero(T t) static void check_divide_by_zero(T t)
{ {
if(std::is_arithmetic<T>::value) if(t==0) throw chaiscript::exception::arithmetic_error("divide by zero"); if(std::is_integral<T>::value && std::is_arithmetic<T>::value && t==0) {
throw chaiscript::exception::arithmetic_error("divide by zero");
}
} }
#else #else
template<typename T> template<typename T>

2
include/chaiscript/language/chaiscript_eval.hpp
View File

@@ -93,6 +93,8 @@ namespace chaiscript
// If it's an arithmetic operation we want to short circuit dispatch // If it's an arithmetic operation we want to short circuit dispatch
try{ try{
return Boxed_Number::do_oper(t_oper, t_lhs, t_rhs); return Boxed_Number::do_oper(t_oper, t_lhs, t_rhs);
} catch (const chaiscript::exception::arithmetic_error &) {
throw;
} catch (...) { } catch (...) {
throw exception::eval_error("Error with numeric operator calling: " + t_oper_string); throw exception::eval_error("Error with numeric operator calling: " + t_oper_string);
} }