misc fixes

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1068 b08c6af1-5177-4d33-ba66-4b1c6b8b522a

pl/debug.yap

@@ -316,9 +316,11 @@ debugging :-
      throw('$fail_spy'(GoalNumber)).
 '$loop_spy_event'(abort, _, _, _, _) :- !,
      throw(abort).
-'$loop_spy_event'(Event, GoalNumber, G, Module, _) :- !,
-     '$trace'(exception(Event),G,Module,GoalNumber),
-     fail.
+'$loop_spy_event'(Event, GoalNumber, G, Module, InControl) :- !,
+     '$system_catch'(
+		     ('$trace'(exception(Event),G,Module,GoalNumber),fail),
+		     Module,NewEvent,
+		     '$loop_spy_event'(NewEvent, GoalNumber, G, Module, InControl)).
 
 
 '$loop_fail'(GoalNumber, G, Module, InControl) :-

pl/setof.yap

@@ -122,7 +122,6 @@ bagof(Template, Generator, Bag) :-
 	Key =.. ['$'|LFreeVars],
 	'$init_db_queue'(Ref),
 	'$findall_with_common_vars'(Key-Template, Generator, Ref, Bags0),
-write(vsc:(Bags0,Bags)),nl,
 	'$keysort'(Bags0, Bags),
 	'$pick'(Bags, Key, Bag).
 % or we just have a list of answers