debugger events should be known to the debugger!

This commit is contained in:
Vitor Santos Costa 2009-04-22 11:31:31 -05:00
parent 3c84466d05
commit cf2b399e9a

View File

@ -340,7 +340,7 @@ 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, Event, Module, '$debug_event'(Event),
'$loop_spy_event'(Event, GoalNumber, G, Module, CalledFromDebugger)). '$loop_spy_event'(Event, GoalNumber, G, Module, CalledFromDebugger)).
% handle weird things happening in the debugger. % handle weird things happening in the debugger.
@ -348,24 +348,24 @@ debugging :-
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'('$retry_spy'(GoalNumber), _, _, _, _) :- !,
throw('$retry_spy'(GoalNumber)). throw('$debug_event'('$retry_spy'(GoalNumber))).
'$loop_spy_event'('$fail_spy'(G0), GoalNumber, G, Module, CalledFromDebugger) :- '$loop_spy_event'('$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'('$fail_spy'(GoalNumber), _, _, _, _) :- !,
throw('$fail_spy'(GoalNumber)). throw('$debug_event'('$fail_spy'(GoalNumber))).
'$loop_spy_event'('$done_spy'(G0,G), GoalNumber, G, _, CalledFromDebugger) :- '$loop_spy_event'('$done_spy'(G0,G), GoalNumber, G, _, CalledFromDebugger) :-
G0 >= GoalNumber, !, G0 >= GoalNumber, !,
'$continue_debugging'(CalledFromDebugger). '$continue_debugging'(CalledFromDebugger).
'$loop_spy_event'('$done_spy'(GoalNumber), _, _, _, _) :- !, '$loop_spy_event'('$done_spy'(GoalNumber), _, _, _, _) :- !,
throw('$done_spy'(GoalNumber)). throw('$debug_event'('$done_spy'(GoalNumber))).
'$loop_spy_event'(abort, _, _, _, _) :- !, '$loop_spy_event'(abort, _, _, _, _) :- !,
throw('$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,NewEvent, Module,'$debug_event'(NewEvent),
'$loop_spy_event'(NewEvent, GoalNumber, G, Module, CalledFromDebugger)). '$loop_spy_event'(NewEvent, GoalNumber, G, Module, CalledFromDebugger)).
@ -602,8 +602,8 @@ debugging :-
'$skipeol'(0'e), '$skipeol'(0'e),
halt. halt.
'$action'(0'f,_,CallId,_,_,_) :- !, % 'f fail '$action'(0'f,_,CallId,_,_,_) :- !, % 'f fail
'$scan_number'(0'f, CallId, GoalId), '$scan_number'(0'f, CallId, GoalId), %'f
throw('$fail_spy'(GoalId)). throw('$debug_event'('$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('$retry_spy'(ScanNumber)). throw('$debug_event'('$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) ->