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

Merge pull request #2302 from triska/dcg_representation

Browse Source 
Throw representation errors for unsupported DCG grammar control constructs
This commit is contained in:
Mark Thom
2024-01-22 00:26:23 -07:00
committed by GitHub
parent 58cd0d1669 81dba11ab1
commit eab3bff78b
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/clpz.pl
View File

@@ -4171,6 +4171,7 @@ var(V) --> { var(V) }.
ground(T) --> { ground(T) }.
true --> [].
false --> { false }.
X >= Y --> { X >= Y }.
X =< Y --> { X =< Y }.
@@ -4228,7 +4229,7 @@ activate_propagator(propagator(P,State)) -->
)
).
%do_queue --> print_queue, { false }.
%do_queue --> print_queue, false.
do_queue -->
( queue_enabled ->
( queue_get_goal(Goal) -> { call(Goal) }, do_queue
@@ -4592,7 +4593,7 @@ run_propagator(pserialized(S_I, D_I, S_J, D_J, _), MState) -->
kill(MState),
( S_I + D_I =< S_J -> []
; S_J + D_J =< S_I -> []
; { false }
; false
)
; serialize_lower_upper(S_I, D_I, S_J, D_J, MState),
serialize_lower_upper(S_J, D_J, S_I, D_I, MState)
@@ -4665,7 +4666,7 @@ run_propagator(x_eq_abs_plus_v(X,V), MState) -->
( nonvar(V) ->
( V =:= 0 -> kill(MState), { X in 0..sup }
; V < 0 -> kill(MState), { X #= V / 2 }
; V > 0 -> { false }
; false % V > 0
)
; nonvar(X) ->
kill(MState),
@@ -5052,8 +5053,8 @@ run_propagator(ptzdiv(X,Y,Z,Morph), MState) -->
%% % Z = X mod Y
run_propagator(pmod(X,Y,Z), MState) -->
( Y == 0 -> { false }
; Y == Z -> { false }
( Y == 0 -> false
; Y == Z -> false
; X == Y -> kill(MState), queue_goal(Z = 0)
; true
),
@@ -5062,7 +5063,7 @@ run_propagator(pmod(X,Y,Z), MState) -->
Z is X mod Y
; nonvar(Y), nonvar(Z) ->
( Y > 0 -> Z >= 0, Z < Y
; Y < 0 -> Z =< 0, Z > Y
; Z =< 0, Z > Y % Y < 0
),
( { fd_get(X, _, n(XL), _, _) } ->
( (XL - Z) mod Y =\= 0 ->
@@ -5131,7 +5132,7 @@ run_propagator(pmodz(X,Y,Z), MState) -->
fd_put(Z, ZD2, ZPs)
% queue_goal(Z #=< X)
)
; X < 0 ->
; X < 0,
( { fd_get(Y, _, _, n(YU), _), YU < X } ->
kill(MState),
queue_goal(Z = X)
@@ -5171,7 +5172,7 @@ run_propagator(pmodz(X,Y,Z), MState) -->
fd_put(Z, ZD5, ZPs)
% queue_goal(Z in ZMin..0)
)
; Y > 0 ->
; Y > 0,
( { fd_get(X, _, n(XL), n(XU), _), XL >= 0, Y > XU } ->
kill(MState),
queue_goal(Z = X)
@@ -5382,7 +5383,7 @@ run_propagator(pmax(X,Y,Z), MState) -->
; nonvar(Z) ->
( Z =:= X -> kill(MState), queue_goal(X #>= Y)
; Z > X -> queue_goal(Z = Y)
; { false } % Z < X
; false % Z < X
)
; Y == Z -> kill(MState), queue_goal(Y #>= X)
; { fd_get(Y, _, YInf, YSup, _) },
@@ -5418,7 +5419,7 @@ run_propagator(pmin(X,Y,Z), MState) -->
; nonvar(Z) ->
( Z =:= X -> kill(MState), { X #=< Y }
; Z < X -> Z = Y
; { false } % Z > X
; false % Z > X
)
; Y == Z -> kill(MState), queue_goal(Y #=< X)
; { fd_get(Y, _, YInf, YSup, _) },
@@ -5733,8 +5734,7 @@ run_propagator(reified_fd(V,B), MState) -->
B = 1
; { B == 0 } ->
( { fd_inf(V, inf) } -> []
; { fd_sup(V, sup) } -> []
; { false }
; { fd_sup(V, sup) }
)
; []
).

10
src/lib/dcgs.pl
View File

@@ -154,8 +154,6 @@ dcg_body(GRBody, S0, S, Body) :-
dcg_body(NonTerminal, S0, S, Goal1) :-
nonvar(NonTerminal),
\+ dcg_constr(NonTerminal),
NonTerminal \= ( _ -> _ ),
NonTerminal \= ( \+ _ ),
loader:strip_module(NonTerminal, M, NonTerminal0),
dcg_non_terminal(NonTerminal0, S0, S, Goal0),
( functor(NonTerminal, (:), 2) ->
@@ -176,8 +174,10 @@ dcg_constr(phrase(_)). % 7.14.9
dcg_constr(phrase(_,_)). % extension of 7.14.9
dcg_constr(phrase(_,_,_)). % extension of 7.14.9
dcg_constr(!). % 7.14.10
%% dcg_constr(\+ _). % 7.14.11 - not (existence implementation dep.)
dcg_constr((_->_)). % 7.14.12 - if-then (existence implementation dep.)
dcg_constr(\+ _) :- % 7.14.11 - not (existence implementation dep.)
throw(error(representation_error(dcg_body), phrase/3)).
dcg_constr((_->_)) :- % 7.14.12 - if-then (existence implementation dep.)
throw(error(representation_error(dcg_body), phrase/3)).
% The principal functor of the first argument indicates
% the construct to be expanded.
@@ -244,6 +244,8 @@ seqq([Es|Ess]) --> seq(Es), seqq(Ess).
error_goal(error(E, must_be/2), error(E, must_be/2)).
error_goal(error(E, (=..)/2), error(E, (=..)/2)).
error_goal(error(representation_error(dcg_body), Context),
error(representation_error(dcg_body), Context)).
error_goal(E, _) :- throw(E).
user:goal_expansion(phrase(GRBody, S, S0), GRBody2) :-