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

capture and propagate (=..)/2 errors in phrase/{2,3} (#1460)

Browse Source
This commit is contained in:
Mark Thom
2022-06-21 22:47:55 -06:00
parent 2eec6499ff
commit 607c84a79b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/dcgs.pl
View File

@@ -154,12 +154,17 @@ seqq([Es|Ess]) --> seq(Es), seqq(Ess).
% Describes an arbitrary number of elements % Describes an arbitrary number of elements
... --> [] | [_], ... . ... --> [] | [_], ... .
error_goal(error(E, must_be/2), error(E, must_be/2)).
error_goal(error(E, (=..)/2), error(E, (=..)/2)).
error_goal(E, _) :- throw(E).
user:goal_expansion(phrase(GRBody, S, S0), GRBody1) :- user:goal_expansion(phrase(GRBody, S, S0), GRBody1) :-
load_context(GRBody, M, GRBody0), load_context(GRBody, M, GRBody0),
nonvar(GRBody0), nonvar(GRBody0),
catch(dcgs:dcg_body(GRBody0, S, S0, GRBody1, M), catch(dcgs:dcg_body(GRBody0, S, S0, GRBody1, M),
error(E, must_be/2), E,
( GRBody1 = throw(error(E, must_be/2)) ) dcgs:error_goal(E, GRBody1)
). ).
user:goal_expansion(phrase(GRBody, S), phrase(GRBody, S, [])). user:goal_expansion(phrase(GRBody, S), phrase(GRBody, S, [])).