[m-dev.] trivial diff: rename execution_tree to annotated_trace

[Mark Anthony BROWN]

Hi,

This was actually meant to be part of the earlier change to
update the back end.

Cheers,
Mark.

Estimated hours taken: 0.2

browser/declarative_debugger.m:
browser/declarative_execution.m:
	Rename execution_tree to annotated_trace.

Index: declarative_debugger.m
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/declarative_debugger.m,v
retrieving revision 1.12
diff -u -r1.12 declarative_debugger.m
--- declarative_debugger.m	2000/02/22 10:45:37	1.12
+++ declarative_debugger.m	2000/02/23 01:50:51
@@ -79,7 +79,7 @@
 
 :- pred diagnosis(S, R, diagnoser_response, diagnoser_state(R),
 		diagnoser_state(R), io__state, io__state)
-			<= execution_tree(S, R).
+			<= annotated_trace(S, R).
 :- mode diagnosis(in, in, out, in, out, di, uo) is det.
 
 %-----------------------------------------------------------------------------%
@@ -132,7 +132,7 @@
 
 :- pred handle_analyser_response(S, analyser_response(edt_node(R)),
 		diagnoser_response, diagnoser_state(R), diagnoser_state(R),
-		io__state, io__state) <= execution_tree(S, R).
+		io__state, io__state) <= annotated_trace(S, R).
 :- mode handle_analyser_response(in, in, out, in, out, di, uo) is det.
 
 handle_analyser_response(_, no_suspects, no_bug_found, D, D) -->
@@ -157,7 +157,7 @@
 
 :- pred handle_oracle_response(S, oracle_response, diagnoser_response,
 		diagnoser_state(R), diagnoser_state(R), io__state, io__state)
-			<= execution_tree(S, R).
+			<= annotated_trace(S, R).
 :- mode handle_oracle_response(in, in, out, in, out, di, uo) is det.
 
 handle_oracle_response(Store, oracle_answers(Answers), Response, Diagnoser0,
@@ -178,7 +178,7 @@
 
 :- pred confirm_bug(S, decl_bug(edt_node(R)), diagnoser_response,
 		diagnoser_state(R), diagnoser_state(R), io__state, io__state)
-		<= execution_tree(S, R).
+		<= annotated_trace(S, R).
 :- mode confirm_bug(in, in, out, in, out, di, uo) is det.
 
 confirm_bug(Store, Bug, Response, Diagnoser0, Diagnoser) -->
@@ -241,7 +241,7 @@
 :- type edt_node(R)
 	--->	dynamic(R).
 
-:- instance mercury_edt(wrap(S), edt_node(R)) <= execution_tree(S, R)
+:- instance mercury_edt(wrap(S), edt_node(R)) <= annotated_trace(S, R)
 	where [
 		pred(edt_root/3) is trace_root,
 		pred(edt_children/3) is trace_children
@@ -252,7 +252,7 @@
 	%
 :- type wrap(S) ---> wrap(S).
 
-:- pred trace_root(wrap(S), edt_node(R), decl_question) <= execution_tree(S, R).
+:- pred trace_root(wrap(S), edt_node(R), decl_question) <= annotated_trace(S, R).
 :- mode trace_root(in, in, out) is det.
 
 trace_root(wrap(Store), dynamic(Ref), Root) :-
@@ -273,7 +273,7 @@
 	).
 
 :- pred get_answers(S, R, list(decl_atom), list(decl_atom))
-		<= execution_tree(S, R).
+		<= annotated_trace(S, R).
 :- mode get_answers(in, in, in, out) is det.
 
 get_answers(Store, RedoId, As0, As) :-
@@ -287,7 +287,7 @@
 	).
 
 :- pred trace_children(wrap(S), edt_node(R), list(edt_node(R)))
-		<= execution_tree(S, R).
+		<= annotated_trace(S, R).
 :- mode trace_children(in, in, out) is semidet.
 
 trace_children(wrap(Store), dynamic(Ref), Children) :-
@@ -311,7 +311,7 @@
 	).
 
 :- pred wrong_answer_children(S, R, list(edt_node(R)), list(edt_node(R)))
-		<= execution_tree(S, R).
+		<= annotated_trace(S, R).
 :- mode wrong_answer_children(in, in, in, out) is det.
 
 wrong_answer_children(Store, NodeId, Ns0, Ns) :-
@@ -373,7 +373,7 @@
 	).
 
 :- pred missing_answer_children(S, R, list(edt_node(R)), list(edt_node(R)))
-		<= execution_tree(S, R).
+		<= annotated_trace(S, R).
 :- mode missing_answer_children(in, in, in, out) is det.
 
 missing_answer_children(Store, NodeId, Ns0, Ns) :-
Index: declarative_execution.m
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/declarative_execution.m,v
retrieving revision 1.5
diff -u -r1.5 declarative_execution.m
--- declarative_execution.m	2000/02/22 10:45:38	1.5
+++ declarative_execution.m	2000/02/23 01:51:01
@@ -125,7 +125,7 @@
 	% an abstract mapping from the identfiers to the nodes they
 	% identify.
 	%
-:- typeclass execution_tree(S, R) where [
+:- typeclass annotated_trace(S, R) where [
 
 		% Dereference the identifier.  This fails if the
 		% identifier does not refer to any trace_node (ie.
@@ -139,12 +139,12 @@
 	% The following procedures also dereference the identifiers,
 	% but they give an error if the node is not of the expected type.
 	%
-:- pred det_trace_node_from_id(S, R, trace_node(R)) <= execution_tree(S, R).
+:- pred det_trace_node_from_id(S, R, trace_node(R)) <= annotated_trace(S, R).
 :- mode det_trace_node_from_id(in, in, out) is det.
 
 :- inst trace_node_call = bound(call(ground, ground, ground, ground)).
 
-:- pred call_node_from_id(S, R, trace_node(R)) <= execution_tree(S, R).
+:- pred call_node_from_id(S, R, trace_node(R)) <= annotated_trace(S, R).
 :- mode call_node_from_id(in, in, out(trace_node_call)) is det.
 
 :- inst trace_node_redo = bound(redo(ground, ground)).
@@ -152,33 +152,33 @@
 	% maybe_redo_node_from_id/3 fails if the argument is a
 	% NULL reference.
 	% 
-:- pred maybe_redo_node_from_id(S, R, trace_node(R)) <= execution_tree(S, R).
+:- pred maybe_redo_node_from_id(S, R, trace_node(R)) <= annotated_trace(S, R).
 :- mode maybe_redo_node_from_id(in, in, out(trace_node_redo)) is semidet.
 
 :- inst trace_node_exit = bound(exit(ground, ground, ground, ground)).
 
-:- pred exit_node_from_id(S, R, trace_node(R)) <= execution_tree(S, R).
+:- pred exit_node_from_id(S, R, trace_node(R)) <= annotated_trace(S, R).
 :- mode exit_node_from_id(in, in, out(trace_node_exit)) is det.
 
 :- inst trace_node_cond = bound(cond(ground, ground, ground)).
 
-:- pred cond_node_from_id(S, R, trace_node(R)) <= execution_tree(S, R).
+:- pred cond_node_from_id(S, R, trace_node(R)) <= annotated_trace(S, R).
 :- mode cond_node_from_id(in, in, out(trace_node_cond)) is det.
 
 :- inst trace_node_neg = bound(neg(ground, ground, ground)).
 
-:- pred neg_node_from_id(S, R, trace_node(R)) <= execution_tree(S, R).
+:- pred neg_node_from_id(S, R, trace_node(R)) <= annotated_trace(S, R).
 :- mode neg_node_from_id(in, in, out(trace_node_neg)) is det.
 
 :- inst trace_node_first_disj = bound(first_disj(ground, ground)).
 
-:- pred first_disj_node_from_id(S, R, trace_node(R)) <= execution_tree(S, R).
+:- pred first_disj_node_from_id(S, R, trace_node(R)) <= annotated_trace(S, R).
 :- mode first_disj_node_from_id(in, in, out(trace_node_first_disj)) is det.
 
 :- inst trace_node_disj = bound(first_disj(ground, ground);
 				later_disj(ground, ground, ground)).
 
-:- pred disj_node_from_id(S, R, trace_node(R)) <= execution_tree(S, R).
+:- pred disj_node_from_id(S, R, trace_node(R)) <= annotated_trace(S, R).
 :- mode disj_node_from_id(in, in, out(trace_node_disj)) is det.
 
 	% Load an execution tree which was previously saved by
@@ -203,7 +203,7 @@
 	%
 :- type trace_node_store.
 :- type trace_node_id.
-:- instance execution_tree(trace_node_store, trace_node_id).
+:- instance annotated_trace(trace_node_store, trace_node_id).
 
 	% This instance is used when the declarative debugger is in
 	% test mode.  Values of this instance are produced by copying
@@ -212,7 +212,7 @@
 	% 
 :- type trace_node_map.
 :- type trace_node_key.
-:- instance execution_tree(trace_node_map, trace_node_key).
+:- instance annotated_trace(trace_node_map, trace_node_key).
 
 %-----------------------------------------------------------------------------%
 
@@ -302,7 +302,7 @@
 
 %-----------------------------------------------------------------------------%
 
-:- instance execution_tree(trace_node_store, trace_node_id) where [
+:- instance annotated_trace(trace_node_store, trace_node_id) where [
 	pred(trace_node_from_id/3) is search_trace_node_store
 ].
 
@@ -742,7 +742,7 @@
 	% can be written to or read in from a stream easily.  It
 	% is not as efficient to use as the earlier instance, though.
 	%
-:- instance execution_tree(trace_node_map, trace_node_key) where [
+:- instance annotated_trace(trace_node_map, trace_node_key) where [
 	pred(trace_node_from_id/3) is search_trace_node_map
 ].
 
-- 
Mark Brown, PhD student            )O+  |  "Another of Fortran's breakthroughs
(m.brown at cs.mu.oz.au)                   |  was the GOTO statement, which was...
Dept. of Computer Science and Software  |  uniquely simple and understandable"
Engineering, University of Melbourne    |              -- IEEE, 1994
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------