diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

error handling woes

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-09-25 14:31:58 +01:00
parent b871f6676e
commit fa586f8769
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pl/arith.yap
View File

@ -1,5 +1,4 @@
/**************** /*************************************************************************
*********************************************************
* * * *
* YAP Prolog * * YAP Prolog *
* * * *
@ -130,15 +129,19 @@ do_c_built_in(Mod:G, _, H, OUT) :-
do_c_built_metacall(G1, M1, H, OUT). do_c_built_metacall(G1, M1, H, OUT).
do_c_built_in('C'(A,B,C), _, _, (A=[B|C])) :- !. do_c_built_in('C'(A,B,C), _, _, (A=[B|C])) :- !.
do_c_built_in('$do_error'( Error, Goal), M, H, do_c_built_in('$do_error'( Error, Goal), M, H,
('$cp'(Goal, Caller),functor(H,Na,Ar), throw(error(Error, [g=Goal,c=c(M:Na/Ar,File,FilePos),p=Caller])) ) :- ('$p_and_cp'(Goal, Caller),
stream_property( loop_stream, name(File) ). functor(H,Na,Ar),
throw(error(Error, [g=Goal,c=c(M:Na/Ar,File,FilePos),p=Caller]))
)
):-
stream_property( loop_stream, name(File) ),
stream_property( loop_stream, position(FilePos) ). stream_property( loop_stream, position(FilePos) ).
do_c_built_in(X is Y, M, _, P) :- do_c_built_in(X is Y, M, H, P) :-
primitive(X), !, primitive(X), !,
do_c_built_in(X =:= Y, M, P). do_c_built_in(X =:= Y, M, H, P).
do_c_built_in(X is Y, M, _, (P,A=X)) :- do_c_built_in(X is Y, M, H, (P,A=X)) :-
nonvar(X), !, nonvar(X), !,
do_c_built_in(A is Y, M, P). do_c_built_in(A is Y, M, H, P).
do_c_built_in(X is Y, _, _, P) :- do_c_built_in(X is Y, _, _, P) :-
nonvar(Y), % Don't rewrite variables nonvar(Y), % Don't rewrite variables
!, !,
@ -148,8 +151,8 @@ do_c_built_in(X is Y, _, _, P) :-
expand_expr(Y, P0, X0), expand_expr(Y, P0, X0),
'$drop_is'(X0, X, P0, P) '$drop_is'(X0, X, P0, P)
). ).
do_c_built_in(phrase(NT,Xs), Mod, _, NTXsNil) :- do_c_built_in(phrase(NT,Xs), Mod, H, NTXsNil) :-
'$_arith':do_c_built_in(phrase(NT,Xs,[]), Mod, NTXsNil). '$_arith':do_c_built_in(phrase(NT,Xs,[]), Mod, H, NTXsNil).
do_c_built_in(phrase(NT,Xs0,Xs), Mod, _, NewGoal) :- do_c_built_in(phrase(NT,Xs0,Xs), Mod, _, NewGoal) :-
'$goal_expansion_allowed'(phrase(NT,Xs0,Xs), Mod), '$goal_expansion_allowed'(phrase(NT,Xs0,Xs), Mod),
Goal = phrase(NT,Xs0,Xs), Goal = phrase(NT,Xs0,Xs),
@ -183,11 +186,11 @@ do_c_built_in(Comp0, _, _, R) :- % now, do it for comparisons
'$do_and'(R0, Comp, R). '$do_and'(R0, Comp, R).
do_c_built_in(P, _M, _H, P). do_c_built_in(P, _M, _H, P).
do_c_built_metacall(G1, Mod, '$execute_wo_mod'(G1,Mod)) :- do_c_built_metacall(G1, Mod, _, '$execute_wo_mod'(G1,Mod)) :-
var(Mod), !. var(Mod), !.
do_c_built_metacall(G1, Mod, '$execute_in_mod'(G1,Mod)) :- do_c_built_metacall(G1, Mod, _, '$execute_in_mod'(G1,Mod)) :-
atom(Mod), !. atom(Mod), !.
do_c_built_metacall(G1, Mod, call(Mod:G1)). do_c_built_metacall(G1, Mod, _, call(Mod:G1)).
'$do_and'(true, P, P) :- !. '$do_and'(true, P, P) :- !.
'$do_and'(P, true, P) :- !. '$do_and'(P, true, P) :- !.

2
pl/profile.yap
View File

@ -205,7 +205,7 @@ showprofres(A) :-
'$get_ppreds'([gprof(0,_,0)|Cls],Ps) :- !, '$get_ppreds'([gprof(0,_,0)|Cls],Ps) :- !,
'$get_ppreds'(Cls,Ps). '$get_ppreds'(Cls,Ps).
'$get_ppreds'([gprof(0,_,Count)|_],_) :- !, '$get_ppreds'([gprof(0,_,Count)|_],_) :- !,
'$do_error'(SYSTEM_ERROR_INTERNAL,showprofres(gprof(0,_,Count))). '$do_error'('SYSTEM_ERROR_INTERNAL',showprofres(gprof(0,_,Count))).
'$get_ppreds'([gprof(PProfInfo,_,Count0)|Cls],[Sum-(Mod:Name/Arity)|Ps]) :- '$get_ppreds'([gprof(PProfInfo,_,Count0)|Cls],[Sum-(Mod:Name/Arity)|Ps]) :-
'$get_more_ppreds'(Cls,PProfInfo,Count0,NCls,Sum), '$get_more_ppreds'(Cls,PProfInfo,Count0,NCls,Sum),
'$get_pred_pinfo'(PProfInfo,Mod,Name,Arity), '$get_pred_pinfo'(PProfInfo,Mod,Name,Arity),

2
pl/signals.yap
View File

@ -293,7 +293,7 @@ on_signal(Signal,OldAction,default) :-
'$reset_signal'(Signal, OldAction). '$reset_signal'(Signal, OldAction).
on_signal(_Signal,_OldAction,Action) :- on_signal(_Signal,_OldAction,Action) :-
var(Action), !, var(Action), !,
throw(error(SYSTEM_ERROR_INTERNAL,'Somehow the meta_predicate declarations of on_signal are subverted!')). throw(error('SYSTEM_ERROR_INTERNAL','Somehow the meta_predicate declarations of on_signal are subverted!')).
on_signal(Signal,OldAction,Action) :- on_signal(Signal,OldAction,Action) :-
Action = (_:Goal), Action = (_:Goal),
var(Goal), !, var(Goal), !,