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

fail when retracting undefined dynamic predicates (#918)

Browse Source
This commit is contained in:
Mark Thom
2021-04-30 20:36:56 -06:00
parent 7cc89da879
commit d8bd4fbea6
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/builtins.pl
View File

@@ -847,7 +847,7 @@ asserta_clause(Head, Body) :-
asserta(Clause) :- asserta(Clause) :-
( Clause \= (_ :- _) -> ( Clause \= (_ :- _) ->
Head = Clause, Head = Clause,
Body = user:true, Body = true,
asserta_clause(Head, Body) asserta_clause(Head, Body)
; Clause = (Head :- Body) -> ; Clause = (Head :- Body) ->
asserta_clause(Head, Body) asserta_clause(Head, Body)
@@ -897,7 +897,7 @@ assertz_clause(Head, Body) :-
assertz(Clause) :- assertz(Clause) :-
( Clause \= (_ :- _) -> ( Clause \= (_ :- _) ->
Head = Clause, Head = Clause,
Body = user:true, Body = true,
assertz_clause(Head, Body) assertz_clause(Head, Body)
; Clause = (Head :- Body) -> ; Clause = (Head :- Body) ->
assertz_clause(Head, Body) assertz_clause(Head, Body)
@@ -926,7 +926,9 @@ retract_module_clause(Head, Body, Module) :-
( var(Head) -> ( var(Head) ->
throw(error(instantiation_error, retract/1)) throw(error(instantiation_error, retract/1))
; callable(Head), functor(Head, Name, Arity) -> ; callable(Head), functor(Head, Name, Arity) ->
( '$head_is_dynamic'(Module, Head) -> ( '$no_such_predicate'(Module, Head) ->
'$fail'
; '$head_is_dynamic'(Module, Head) ->
( Module == user -> ( Module == user ->
call_retract(Head, Body, Name, Arity) call_retract(Head, Body, Name, Arity)
; call_module_retract(Head, Body, Name, Arity, Module) ; call_module_retract(Head, Body, Name, Arity, Module)
@@ -970,10 +972,10 @@ retract_clause(Head, Body) :-
arg(1, Head, Module), arg(1, Head, Module),
arg(2, Head, F), arg(2, Head, F),
retract_module_clause(F, Body, Module) retract_module_clause(F, Body, Module)
; '$head_is_dynamic'(user, Head) ->
call_retract(Head, Body, Name, Arity)
; '$no_such_predicate'(user, Head) -> ; '$no_such_predicate'(user, Head) ->
'$fail' '$fail'
; '$head_is_dynamic'(user, Head) ->
call_retract(Head, Body, Name, Arity)
; throw(error(permission_error(modify, static_procedure, Name/Arity), retract/1)) ; throw(error(permission_error(modify, static_procedure, Name/Arity), retract/1))
) )
; throw(error(type_error(callable, Head), retract/1)) ; throw(error(type_error(callable, Head), retract/1))