March 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Revised exceptions that can be thrown.
by Patricia Hill 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: master Commit: 3ac27881f203b6c0c085747486dd38ee8c556acf URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3ac27881f203… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 22 12:01:52 2010 +0000 Revised exceptions that can be thrown. --- interfaces/OCaml/ppl_ocaml_common.defs.hh | 8 ++++++++ interfaces/Prolog/ppl_prolog_common.cc | 10 ---------- interfaces/Prolog/ppl_prolog_common.defs.hh | 6 ------ 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/interfaces/OCaml/ppl_ocaml_common.defs.hh b/interfaces/OCaml/ppl_ocaml_common.defs.hh index 7754c68..21e64f9 100644 --- a/interfaces/OCaml/ppl_ocaml_common.defs.hh +++ b/interfaces/OCaml/ppl_ocaml_common.defs.hh @@ -201,6 +201,14 @@ catch(std::overflow_error& e) { \ caml_raise_with_string(*caml_named_value("PPL_arithmetic_overflow"), \ (const_cast<char*>(e.what()))); \ } \ +catch(std::domain_error& e) { \ + caml_raise_with_string(*caml_named_value("PPL_domain_error"), \ + (const_cast<char*>(e.what()))); \ +} \ +catch(std::length_error& e) { \ + caml_raise_with_string(*caml_named_value("PPL_length_error"), \ + (const_cast<char*>(e.what()))); \ +} \ catch(std::logic_error& e) { \ caml_raise_with_string(*caml_named_value("PPL_logic_error"), \ (const_cast<char*>(e.what()))); \ diff --git a/interfaces/Prolog/ppl_prolog_common.cc b/interfaces/Prolog/ppl_prolog_common.cc index 1632a3d..2373e3d 100644 --- a/interfaces/Prolog/ppl_prolog_common.cc +++ b/interfaces/Prolog/ppl_prolog_common.cc @@ -161,7 +161,6 @@ Prolog_atom a_ppl_overflow_error; Prolog_atom a_ppl_domain_error; Prolog_atom a_ppl_length_error; Prolog_atom a_ppl_invalid_argument; -Prolog_atom a_ppl_out_of_range; Prolog_atom a_ppl_logic_error; Prolog_atom a_ppl_representation_error; Prolog_atom a_expected; @@ -248,7 +247,6 @@ const Prolog_Interface_Atom prolog_interface_atoms[] = { { &a_ppl_domain_error, "ppl_domain_error" }, { &a_ppl_length_error, "ppl_length_error" }, { &a_ppl_invalid_argument, "ppl_invalid_argument" }, - { &a_ppl_out_of_range, "ppl_out_of_range" }, { &a_ppl_logic_error, "ppl_logic_error" }, { &a_ppl_representation_error, "ppl_representation_error" }, { &a_expected, "expected" }, @@ -604,14 +602,6 @@ handle_exception(const std::invalid_argument& e) { } void -handle_exception(const std::out_of_range& e) { - Prolog_term_ref et = Prolog_new_term_ref(); - Prolog_construct_compound(et, a_ppl_out_of_range, - Prolog_atom_term_from_string(e.what())); - Prolog_raise_exception(et); -} - -void handle_exception(const std::logic_error& e) { Prolog_term_ref et = Prolog_new_term_ref(); Prolog_construct_compound(et, a_ppl_logic_error, diff --git a/interfaces/Prolog/ppl_prolog_common.defs.hh b/interfaces/Prolog/ppl_prolog_common.defs.hh index 2de53de..6fb21c6 100644 --- a/interfaces/Prolog/ppl_prolog_common.defs.hh +++ b/interfaces/Prolog/ppl_prolog_common.defs.hh @@ -419,9 +419,6 @@ void handle_exception(const std::invalid_argument& e); void -handle_exception(const std::out_of_range& e); - -void handle_exception(const std::logic_error& e); void @@ -525,9 +522,6 @@ handle_exception(const deterministic_timeout_exception&); catch(const std::invalid_argument& e) { \ handle_exception(e); \ } \ - catch(const std::out_of_range& e) { \ - handle_exception(e); \ - } \ catch (const std::logic_error& e) { \ handle_exception(e); \ } \

1 0

[GIT] ppl/ppl(sparse_matrices): MIP_Problem: optimize find_create() calls in linear_combine().
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: ebb0a33723717260c322a2e1894931707ce94c43 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ebb0a3372371… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 13:02:10 2010 +0100 MIP_Problem: optimize find_create() calls in linear_combine(). --- src/MIP_Problem.cc | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index db51352..95ef74a 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -1202,8 +1202,14 @@ PPL::MIP_Problem::linear_combine(matrix_row_reference_type x, if (j->first < i->first) { if (j->first != k) { // FIXME: check if adding "if (j->second != 0)" speeds this up. - last_i = x.find_create(j->first); + + // The following statements are equivalent to + // sub_mul_assign(x[j->first], j->second, normalized_x_k); + last_i = x.find_create(*j); Coefficient& x_i = (*last_i).second; + x_i *= normalized_x_k; + neg_assign(x_i); + #ifdef PPL_SPARSE_BACKEND_INVALIDATES_REFERENCES i = last_i; ++i; @@ -1212,11 +1218,6 @@ PPL::MIP_Problem::linear_combine(matrix_row_reference_type x, // Here we had (j->first < i->first) therefore (&x != &y) . PPL_ASSERT(& static_cast<matrix_row_const_reference_type>(x) != &y); #endif - PPL_ASSERT(x_i == 0); - // sub_mul_assign(x_i, j->second, normalized_x_k); - x_i = j->second; - x_i *= normalized_x_k; - neg_assign(x_i); ++j; break; @@ -1245,8 +1246,14 @@ PPL::MIP_Problem::linear_combine(matrix_row_reference_type x, if (j->first < i->first) { if (j->first != k) { // FIXME: check if adding "if (j->second != 0)" speeds this up. - last_i = x.find_create(j->first, Coefficient_zero(), last_i); + + // The following statements are equivalent to + // sub_mul_assign(x[j->first], j->second, normalized_x_k); + last_i = x.find_create(*j, last_i); Coefficient& x_i = (*last_i).second; + x_i *= normalized_x_k; + neg_assign(x_i); + #ifdef PPL_SPARSE_BACKEND_INVALIDATES_REFERENCES i = last_i; ++i; @@ -1255,11 +1262,6 @@ PPL::MIP_Problem::linear_combine(matrix_row_reference_type x, // Here we had (j->first < i->first) therefore (&x != &y) . PPL_ASSERT(& static_cast<matrix_row_const_reference_type>(x) != &y); #endif - PPL_ASSERT(x_i == 0); - // sub_mul_assign(x_i, j->second, normalized_x_k); - x_i = j->second; - x_i *= normalized_x_k; - neg_assign(x_i); } ++j; } else { @@ -1285,11 +1287,11 @@ PPL::MIP_Problem::linear_combine(matrix_row_reference_type x, while (j != j_end) { if (j->first != k) { // FIXME: check if adding "if (j->second != 0)" speeds this up. - last_i = x.find_create(j->first, Coefficient_zero(), last_i); + + // The following statements are equivalent to + // sub_mul_assign(x[j->first], j->second, normalized_x_k); + last_i = x.find_create(*j, last_i); Coefficient& x_i = (*last_i).second; - PPL_ASSERT(x_i == 0); - // sub_mul_assign(x_i, j->second, normalized_x_k); - x_i = j->second; x_i *= normalized_x_k; neg_assign(x_i); }

1 0

[GIT] ppl/ppl(master): Added missing C++ exceptions.
by Patricia Hill 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: master Commit: 2ef1ea9ed97e34a147f8cfe49a751a7c952a04ec URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2ef1ea9ed97e… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 22 11:31:29 2010 +0000 Added missing C++ exceptions. --- interfaces/Prolog/ppl_prolog_common.cc | 31 +++++++++++++++++++++++++- interfaces/Prolog/ppl_prolog_common.defs.hh | 18 +++++++++++++++ interfaces/Prolog/tests/pl_check.pl | 2 +- 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/interfaces/Prolog/ppl_prolog_common.cc b/interfaces/Prolog/ppl_prolog_common.cc index 4921bf9..1632a3d 100644 --- a/interfaces/Prolog/ppl_prolog_common.cc +++ b/interfaces/Prolog/ppl_prolog_common.cc @@ -157,10 +157,11 @@ Prolog_atom a_true; Prolog_atom a_false; // To build exception terms. -Prolog_atom a_ppl_invalid_argument; Prolog_atom a_ppl_overflow_error; Prolog_atom a_ppl_domain_error; Prolog_atom a_ppl_length_error; +Prolog_atom a_ppl_invalid_argument; +Prolog_atom a_ppl_out_of_range; Prolog_atom a_ppl_logic_error; Prolog_atom a_ppl_representation_error; Prolog_atom a_expected; @@ -246,7 +247,9 @@ const Prolog_Interface_Atom prolog_interface_atoms[] = { { &a_ppl_overflow_error, "ppl_overflow_error" }, { &a_ppl_domain_error, "ppl_domain_error" }, { &a_ppl_length_error, "ppl_length_error" }, - { &a_ppl_logic_error, "ppl_logic_error" }, + { &a_ppl_invalid_argument, "ppl_invalid_argument" }, + { &a_ppl_out_of_range, "ppl_out_of_range" }, + { &a_ppl_logic_error, "ppl_logic_error" }, { &a_ppl_representation_error, "ppl_representation_error" }, { &a_expected, "expected" }, { &a_found, "found" }, @@ -577,6 +580,14 @@ handle_exception(const std::overflow_error& e) { } void +handle_exception(const std::domain_error& e) { + Prolog_term_ref et = Prolog_new_term_ref(); + Prolog_construct_compound(et, a_ppl_domain_error, + Prolog_atom_term_from_string(e.what())); + Prolog_raise_exception(et); +} + +void handle_exception(const std::length_error& e) { Prolog_term_ref et = Prolog_new_term_ref(); Prolog_construct_compound(et, a_ppl_length_error, @@ -585,6 +596,22 @@ handle_exception(const std::length_error& e) { } void +handle_exception(const std::invalid_argument& e) { + Prolog_term_ref et = Prolog_new_term_ref(); + Prolog_construct_compound(et, a_ppl_invalid_argument, + Prolog_atom_term_from_string(e.what())); + Prolog_raise_exception(et); +} + +void +handle_exception(const std::out_of_range& e) { + Prolog_term_ref et = Prolog_new_term_ref(); + Prolog_construct_compound(et, a_ppl_out_of_range, + Prolog_atom_term_from_string(e.what())); + Prolog_raise_exception(et); +} + +void handle_exception(const std::logic_error& e) { Prolog_term_ref et = Prolog_new_term_ref(); Prolog_construct_compound(et, a_ppl_logic_error, diff --git a/interfaces/Prolog/ppl_prolog_common.defs.hh b/interfaces/Prolog/ppl_prolog_common.defs.hh index c674f50..2de53de 100644 --- a/interfaces/Prolog/ppl_prolog_common.defs.hh +++ b/interfaces/Prolog/ppl_prolog_common.defs.hh @@ -410,9 +410,18 @@ void handle_exception(const std::overflow_error& e); void +handle_exception(const std::domain_error& e); + +void handle_exception(const std::length_error& e); void +handle_exception(const std::invalid_argument& e); + +void +handle_exception(const std::out_of_range& e); + +void handle_exception(const std::logic_error& e); void @@ -507,9 +516,18 @@ handle_exception(const deterministic_timeout_exception&); catch(const std::overflow_error& e) { \ handle_exception(e); \ } \ + catch(const std::domain_error& e) { \ + handle_exception(e); \ + } \ catch(const std::length_error& e) { \ handle_exception(e); \ } \ + catch(const std::invalid_argument& e) { \ + handle_exception(e); \ + } \ + catch(const std::out_of_range& e) { \ + handle_exception(e); \ + } \ catch (const std::logic_error& e) { \ handle_exception(e); \ } \ diff --git a/interfaces/Prolog/tests/pl_check.pl b/interfaces/Prolog/tests/pl_check.pl index 409966a..98ac28f 100644 --- a/interfaces/Prolog/tests/pl_check.pl +++ b/interfaces/Prolog/tests/pl_check.pl @@ -2788,7 +2788,7 @@ must_catch(Call, cpp_error) :- !, catch( Call, Message, format_exception_message( cpp_error(Message) ) ), ( ( \+ var(Message), - functor(Message, ppl_logic_error, _) ) -> + functor(Message, ppl_invalid_argument, _) ) -> true ; fail

1 0

[GIT] ppl/ppl(master): Revised to allow for for expected logic_error.
by Patricia Hill 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: master Commit: 0ec850342436eb232eedec639fe8250b573a5bef URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0ec850342436… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 22 10:19:29 2010 +0000 Revised to allow for for expected logic_error. --- interfaces/Prolog/tests/pl_check.pl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/interfaces/Prolog/tests/pl_check.pl b/interfaces/Prolog/tests/pl_check.pl index 22b08d3..409966a 100644 --- a/interfaces/Prolog/tests/pl_check.pl +++ b/interfaces/Prolog/tests/pl_check.pl @@ -2787,7 +2787,8 @@ must_catch(Call, prolog_exception_error) :- must_catch(Call, cpp_error) :- !, catch( Call, Message, format_exception_message( cpp_error(Message) ) ), - ( ( \+ var(Message), name(Message, [80,80,76,58,58|_] ) ) -> + ( ( \+ var(Message), + functor(Message, ppl_logic_error, _) ) -> true ; fail

1 0

[GIT] ppl/ppl(master): Let test13 compile.
by Enea Zaffanella 21 Mar '10

21 Mar '10

Module: ppl/ppl Branch: master Commit: 027210b2a7098cbd20259456cac08cb41f5e120d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=027210b2a709… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Mar 21 19:25:53 2010 +0100 Let test13 compile. --- tests/Octagonal_Shape/frequency1.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Octagonal_Shape/frequency1.cc b/tests/Octagonal_Shape/frequency1.cc index 652a5e0..ad840a6 100644 --- a/tests/Octagonal_Shape/frequency1.cc +++ b/tests/Octagonal_Shape/frequency1.cc @@ -299,8 +299,8 @@ test13() { TOctagonal_Shape os(3); os.add_constraint(4*A - 4*B == 1); - o.add_constraint(3*C == 1); - o.add_constraint(B <= 2); + os.add_constraint(3*C == 1); + os.add_constraint(B <= 2); Coefficient num; Coefficient den;

1 0

[GIT] ppl/ppl(termination): Merge branch 'master' into termination
by Roberto Bagnara 21 Mar '10

21 Mar '10

Module: ppl/ppl Branch: termination Commit: ede25520fb54f969f037310ae4ebddd97976607e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ede25520fb54… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 21 07:33:09 2010 +0400 Merge branch 'master' into termination ---

1 0

[GIT] ppl/ppl(termination): Fixed the ordering of exception handlers.
by Roberto Bagnara 21 Mar '10

21 Mar '10

Module: ppl/ppl Branch: termination Commit: b43d29400ddc9823f5d08d4148adb804dcc8e321 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b43d29400ddc… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 21 07:32:40 2010 +0400 Fixed the ordering of exception handlers. --- interfaces/OCaml/ppl_ocaml_common.defs.hh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interfaces/OCaml/ppl_ocaml_common.defs.hh b/interfaces/OCaml/ppl_ocaml_common.defs.hh index db969a8..7754c68 100644 --- a/interfaces/OCaml/ppl_ocaml_common.defs.hh +++ b/interfaces/OCaml/ppl_ocaml_common.defs.hh @@ -201,6 +201,10 @@ catch(std::overflow_error& e) { \ caml_raise_with_string(*caml_named_value("PPL_arithmetic_overflow"), \ (const_cast<char*>(e.what()))); \ } \ +catch(std::logic_error& e) { \ + caml_raise_with_string(*caml_named_value("PPL_logic_error"), \ + (const_cast<char*>(e.what()))); \ +} \ catch(std::runtime_error& e) { \ caml_raise_with_string(*caml_named_value("PPL_internal_error"), \ (const_cast<char*>(e.what()))); \ @@ -209,10 +213,6 @@ catch(std::exception& e) { \ caml_raise_with_string(*caml_named_value("PPL_unknown_standard_exception"), \ (const_cast<char*>(e.what()))); \ } \ -catch(std::logic_error& e) { \ - caml_raise_with_string(*caml_named_value("PPL_logic_error"), \ - (const_cast<char*>(e.what()))); \ -} \ catch(timeout_exception&) { \ reset_timeout(); \ caml_raise_constant(*caml_named_value("PPL_timeout_exception")); \

1 0

[GIT] ppl/ppl(master): Fixed the ordering of exception handlers.
by Roberto Bagnara 21 Mar '10

21 Mar '10

Module: ppl/ppl Branch: master Commit: b43d29400ddc9823f5d08d4148adb804dcc8e321 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b43d29400ddc… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 21 07:32:40 2010 +0400 Fixed the ordering of exception handlers. --- interfaces/OCaml/ppl_ocaml_common.defs.hh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interfaces/OCaml/ppl_ocaml_common.defs.hh b/interfaces/OCaml/ppl_ocaml_common.defs.hh index db969a8..7754c68 100644 --- a/interfaces/OCaml/ppl_ocaml_common.defs.hh +++ b/interfaces/OCaml/ppl_ocaml_common.defs.hh @@ -201,6 +201,10 @@ catch(std::overflow_error& e) { \ caml_raise_with_string(*caml_named_value("PPL_arithmetic_overflow"), \ (const_cast<char*>(e.what()))); \ } \ +catch(std::logic_error& e) { \ + caml_raise_with_string(*caml_named_value("PPL_logic_error"), \ + (const_cast<char*>(e.what()))); \ +} \ catch(std::runtime_error& e) { \ caml_raise_with_string(*caml_named_value("PPL_internal_error"), \ (const_cast<char*>(e.what()))); \ @@ -209,10 +213,6 @@ catch(std::exception& e) { \ caml_raise_with_string(*caml_named_value("PPL_unknown_standard_exception"), \ (const_cast<char*>(e.what()))); \ } \ -catch(std::logic_error& e) { \ - caml_raise_with_string(*caml_named_value("PPL_logic_error"), \ - (const_cast<char*>(e.what()))); \ -} \ catch(timeout_exception&) { \ reset_timeout(); \ caml_raise_constant(*caml_named_value("PPL_timeout_exception")); \

1 0

[GIT] ppl/ppl(termination): New commits
by Roberto Bagnara 21 Mar '10

21 Mar '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3b435f819c6f… Merge: 636c546843046a5cfa6d27a1aa4a8171d7e537ab 0f40cc8d92d033ab5c78cdd2d4661f395603e8b5 Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 21 06:56:23 2010 +0400 Merge branch 'master' into termination URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0f40cc8d92d0… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat Mar 20 22:00:34 2010 +0000 Added further needed code for handling logic_error exception. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8ceb0b7e208b… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat Mar 20 21:49:18 2010 +0000 Added missing code for logic_error exception. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0cf98127510b… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Mar 18 15:08:15 2010 +0000 Added std::logic_error to the list of exceptions caught. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ca9a894625c3… Author: François Galea <francois.galea(a)uvsq.fr> Date: Sat Mar 20 11:41:44 2010 +0100 Added a test generating a solution node with two context constraints. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=42a77adddb8e… Merge: 367f75cf57a1576f54c0bf553c714e838d8c1773 b831a0b77c3ba4f7dbe716619a8b3f225f430079 Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 20 08:27:47 2010 +0400 Merge branch 'master' into products URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=367f75cf57a1… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 15 16:27:50 2010 +0000 Test changed so as to be meaningful for all integer types. Comment typos fixed.

1 0

[GIT] ppl/ppl(master): Added further needed code for handling logic_error exception.
by Patricia Hill 20 Mar '10

20 Mar '10

Module: ppl/ppl Branch: master Commit: 0f40cc8d92d033ab5c78cdd2d4661f395603e8b5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0f40cc8d92d0… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat Mar 20 22:00:34 2010 +0000 Added further needed code for handling logic_error exception. --- interfaces/Prolog/ppl_prolog_common.cc | 10 ++++++++++ interfaces/Prolog/ppl_prolog_common.defs.hh | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/interfaces/Prolog/ppl_prolog_common.cc b/interfaces/Prolog/ppl_prolog_common.cc index 0c1b4a2..4921bf9 100644 --- a/interfaces/Prolog/ppl_prolog_common.cc +++ b/interfaces/Prolog/ppl_prolog_common.cc @@ -161,6 +161,7 @@ Prolog_atom a_ppl_invalid_argument; Prolog_atom a_ppl_overflow_error; Prolog_atom a_ppl_domain_error; Prolog_atom a_ppl_length_error; +Prolog_atom a_ppl_logic_error; Prolog_atom a_ppl_representation_error; Prolog_atom a_expected; Prolog_atom a_found; @@ -245,6 +246,7 @@ const Prolog_Interface_Atom prolog_interface_atoms[] = { { &a_ppl_overflow_error, "ppl_overflow_error" }, { &a_ppl_domain_error, "ppl_domain_error" }, { &a_ppl_length_error, "ppl_length_error" }, + { &a_ppl_logic_error, "ppl_logic_error" }, { &a_ppl_representation_error, "ppl_representation_error" }, { &a_expected, "expected" }, { &a_found, "found" }, @@ -583,6 +585,14 @@ handle_exception(const std::length_error& e) { } void +handle_exception(const std::logic_error& e) { + Prolog_term_ref et = Prolog_new_term_ref(); + Prolog_construct_compound(et, a_ppl_logic_error, + Prolog_atom_term_from_string(e.what())); + Prolog_raise_exception(et); +} + +void handle_exception(const std::bad_alloc&) { Prolog_term_ref et = Prolog_new_term_ref(); Prolog_put_atom(et, out_of_memory_exception_atom); diff --git a/interfaces/Prolog/ppl_prolog_common.defs.hh b/interfaces/Prolog/ppl_prolog_common.defs.hh index ce3fb55..c674f50 100644 --- a/interfaces/Prolog/ppl_prolog_common.defs.hh +++ b/interfaces/Prolog/ppl_prolog_common.defs.hh @@ -510,13 +510,13 @@ handle_exception(const deterministic_timeout_exception&); catch(const std::length_error& e) { \ handle_exception(e); \ } \ - catch (const std::bad_alloc& e) { \ + catch (const std::logic_error& e) { \ handle_exception(e); \ } \ - catch (const std::exception& e) { \ + catch (const std::bad_alloc& e) { \ handle_exception(e); \ } \ - catch (const std::logic_error& e) { \ + catch (const std::exception& e) { \ handle_exception(e); \ } \ catch (...) { \

1 0