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

fix the signal handling a bit better.

This commit is contained in:
Vitor Santos Costa 2009-04-22 16:13:08 -05:00
parent 700ea83b17
commit c1aba9a840
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pl/boot.yap
View File

@ -1160,7 +1160,8 @@ throw(Ball) :-
'catch_ball'(Ball, V) :- 'catch_ball'(Ball, V) :-
var(V), var(V),
nonvar(Ball), nonvar(Ball),
functor(Ball, Name, _), Ball = error(Type,_), % internal error ??
functor(Type, Name, _),
atom_codes(Name, [0'$|_]), %'0 atom_codes(Name, [0'$|_]), %'0
!, fail. !, fail.
'catch_ball'(C, C). 'catch_ball'(C, C).

34
pl/debug.yap
View File

@ -340,33 +340,33 @@ debugging :-
'$loop_spy'(GoalNumber, G, Module, CalledFromDebugger) :- '$loop_spy'(GoalNumber, G, Module, CalledFromDebugger) :-
yap_hacks:current_choice_point(CP), yap_hacks:current_choice_point(CP),
'$system_catch'('$loop_spy2'(GoalNumber, G, Module, CalledFromDebugger, CP), '$system_catch'('$loop_spy2'(GoalNumber, G, Module, CalledFromDebugger, CP),
Module, '$debug_event'(Event), Module, error(Event,Context),
'$loop_spy_event'(Event, GoalNumber, G, Module, CalledFromDebugger)). '$loop_spy_event'(error(Event,Context), GoalNumber, G, Module, CalledFromDebugger)).
% handle weird things happening in the debugger. % handle weird things happening in the debugger.
'$loop_spy_event'('$retry_spy'(G0), GoalNumber, G, Module, CalledFromDebugger) :- '$loop_spy_event'(error('$retry_spy'(G0),_), GoalNumber, G, Module, CalledFromDebugger) :-
G0 >= GoalNumber, !, G0 >= GoalNumber, !,
'$loop_spy'(GoalNumber, G, Module, CalledFromDebugger). '$loop_spy'(GoalNumber, G, Module, CalledFromDebugger).
'$loop_spy_event'('$retry_spy'(GoalNumber), _, _, _, _) :- !, '$loop_spy_event'(error('$retry_spy'(GoalNumber),_), _, _, _, _) :- !,
throw('$debug_event'('$retry_spy'(GoalNumber))). throw(error('$retry_spy'(GoalNumber),[])).
'$loop_spy_event'('$fail_spy'(G0), GoalNumber, G, Module, CalledFromDebugger) :- '$loop_spy_event'(error('$fail_spy'(G0),_), GoalNumber, G, Module, CalledFromDebugger) :-
G0 >= GoalNumber, !, G0 >= GoalNumber, !,
'$loop_fail'(GoalNumber, G, Module, CalledFromDebugger). '$loop_fail'(GoalNumber, G, Module, CalledFromDebugger).
'$loop_spy_event'('$fail_spy'(GoalNumber), _, _, _, _) :- !, '$loop_spy_event'(error('$fail_spy'(GoalNumber),_), _, _, _, _) :- !,
throw('$debug_event'('$fail_spy'(GoalNumber))). throw(error('$fail_spy'(GoalNumber),[])).
'$loop_spy_event'('$done_spy'(G0,G), GoalNumber, G, _, CalledFromDebugger) :- '$loop_spy_event'(error('$done_spy'(G0),_), GoalNumber, G, _, CalledFromDebugger) :-
G0 >= GoalNumber, !, G0 >= GoalNumber, !,
'$continue_debugging'(CalledFromDebugger). '$continue_debugging'(CalledFromDebugger).
'$loop_spy_event'('$done_spy'(GoalNumber), _, _, _, _) :- !, '$loop_spy_event'(error('$done_spy'(GoalNumber),_), _, _, _, _) :- !,
throw('$debug_event'('$done_spy'(GoalNumber))). throw(error('$done_spy'(GoalNumber),[])).
'$loop_spy_event'(abort, _, _, _, _) :- !,
throw('$abort').
'$loop_spy_event'(Event, GoalNumber, G, Module, CalledFromDebugger) :- '$loop_spy_event'(Event, GoalNumber, G, Module, CalledFromDebugger) :-
'$debug_error'(Event), '$debug_error'(Event),
'$system_catch'( '$system_catch'(
('$trace'(exception,G,Module,GoalNumber,_),fail), ('$trace'(exception,G,Module,GoalNumber,_),fail),
Module,'$debug_event'(NewEvent), Module,
'$loop_spy_event'(NewEvent, GoalNumber, G, Module, CalledFromDebugger)). error(NewEvent,NewContext),
'$loop_spy_event'(error(NewEvent,NewContext), GoalNumber, G, Module, CalledFromDebugger)
).
'$debug_error'(Event) :- '$debug_error'(Event) :-
@ -603,7 +603,7 @@ debugging :-
halt. halt.
'$action'(0'f,_,CallId,_,_,_) :- !, % 'f fail '$action'(0'f,_,CallId,_,_,_) :- !, % 'f fail
'$scan_number'(0'f, CallId, GoalId), %'f '$scan_number'(0'f, CallId, GoalId), %'f
throw('$debug_event'('$fail_spy'(GoalId))). throw(error('$fail_spy'(GoalId),[])).
'$action'(0'h,_,_,_,_,_) :- !, % 'h help '$action'(0'h,_,_,_,_,_) :- !, % 'h help
'$action_help', '$action_help',
'$skipeol'(104), '$skipeol'(104),
@ -653,7 +653,7 @@ debugging :-
'$action'(0'r,_,CallId,_,_,_) :- !, % 'r retry '$action'(0'r,_,CallId,_,_,_) :- !, % 'r retry
'$scan_number'(0'r,CallId,ScanNumber), % ' '$scan_number'(0'r,CallId,ScanNumber), % '
'$debug_on'(true), '$debug_on'(true),
throw('$debug_event'('$retry_spy'(ScanNumber))). throw(error('$retry_spy'(ScanNumber),[])).
'$action'(0's,P,CallNumber,_,_,on) :- !, % 's skip '$action'(0's,P,CallNumber,_,_,on) :- !, % 's skip
'$skipeol'(0's), % ' '$skipeol'(0's), % '
( (P=call; P=redo) -> ( (P=call; P=redo) ->