suppress tabled/2 existence errors in tabling library, do not print evaluation errors...

diff --git a/src/lib/tabling/wrapper.pl b/src/lib/tabling/wrapper.pl
index d2d13901e03e352a81f5043acb58ee97978c584d..7925a667b252253bb404a08f1f6f84c14b41aecc 100644 (file)
--- a/src/lib/tabling/wrapper.pl
+++ b/src/lib/tabling/wrapper.pl
@@ -95,10 +95,15 @@ rename((Head --> Body), (NewHead --> Body), Module) :- !,
        functor(Head, Name, Arity),
        PlainArity is Arity+1,
        functor(PlainHead, Name, PlainArity),
-       table_wrapper:tabled(PlainHead, Module),
+       catch(table_wrapper:tabled(PlainHead, Module),
+          error(existence_error(procedure, tabled/2), _),
+          false),
        rename_term(Head, NewHead).
 rename(Head, NewHead, Module) :-
-       table_wrapper:tabled(Head, Module), !,
+       catch(table_wrapper:tabled(Head, Module),
+          error(existence_error(procedure, tabled/2), _),
+          false),
+    !,
        rename_term(Head, NewHead).
 
 rename_term(Compound0, Compound) :-

diff --git a/src/loader.pl b/src/loader.pl
index 8a409ce26b1a16f1ef9febc64d148470b3e2e83b..8f1ef7e407a466b02c114b1411c864b7cc09b23f 100644 (file)
--- a/src/loader.pl
+++ b/src/loader.pl
@@ -18,7 +18,9 @@
 
 
 '$print_message_and_fail'(Error) :-
-    (  Error = error(existence_error(procedure, Expansion), Expansion) ->
+    (  (  Error = error(existence_error(procedure, Expansion), Expansion)
+       ;  Error = error(evaluation_error((_:_)/_),Expansion)
+       )  ->
        (  (  Expansion = goal_expansion/2
           ;  Expansion = term_expansion/2
           )  ->