rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

suppress tabled/2 existence errors in tabling library, do not print evaluation errors generated by term and goal expansion in loader.pl

Browse Source
This commit is contained in:
Mark Thom
2021-02-28 18:56:24 -07:00
parent 3d4a7f97e1
commit 6079402dc4
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/tabling/wrapper.pl
View File

@@ -95,10 +95,15 @@ rename((Head --> Body), (NewHead --> Body), Module) :- !,
functor(Head, Name, Arity), functor(Head, Name, Arity),
PlainArity is Arity+1, PlainArity is Arity+1,
functor(PlainHead, Name, PlainArity), 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_term(Head, NewHead).
rename(Head, NewHead, Module) :- 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(Head, NewHead).
rename_term(Compound0, Compound) :- rename_term(Compound0, Compound) :-

4
src/loader.pl
View File

@@ -18,7 +18,9 @@
'$print_message_and_fail'(Error) :- '$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 = goal_expansion/2
; Expansion = term_expansion/2 ; Expansion = term_expansion/2
) -> ) ->