[m-rev.] for review: fix three bugs in declarative debugger

[Ian MacLarty]

On Mon, Apr 04, 2005 at 09:14:50AM +1000, Julien Fischer wrote:
> > +
> > +:- pred write_maybe_tabled_io_actions(user_state::in,
> > +	list(maybe_tabled_io_action)::in, io::di, io::uo) is cc_multi.
> > +
> > +write_maybe_tabled_io_actions(User, MaybeTabledIoActions, !IO) :-
> > +	filter_tabled_io_actions(MaybeTabledIoActions, IoActions, AreUntabled),
> > +	write_io_actions(User, IoActions, !IO),
> > +	(
> > +		AreUntabled = yes,
> > +		io.write_string(User ^ outstr, "Warning: some IO actions " ++
> > +			"for this atom were not tabled.\n", !IO)
> > +	;
> > +		AreUntabled = no
> > +	).
> > +
> s/were/are/?

Okay.

> 
> > Index: runtime/mercury_trace_base.h
> > ===================================================================
> > RCS file: /home/mercury1/repository/mercury/runtime/mercury_trace_base.h,v
> > retrieving revision 1.45
> > diff -u -r1.45 mercury_trace_base.h
> > --- runtime/mercury_trace_base.h	24 Mar 2005 01:58:05 -0000	1.45
> > +++ runtime/mercury_trace_base.h	26 Mar 2005 05:58:20 -0000
> > @@ -404,10 +404,12 @@
> >  ** This function is called from the Mercury code in the debugger, in the
> >  ** browser directory. It is here, not in the trace directory, because code
> >  ** in the browser directory cannot call functions in the trace directory.
> > +**
> > +** If the io action action_number has not been tabled, then this
> s/action action/action/
> 

action_number refers to the variable.

I've changed it to "If the io action, action_number, has not ...".  Is that 
clearer?

> > ===================================================================
> > RCS file: /home/mercury1/repository/mercury/trace/mercury_trace_declarative.c,v
> > retrieving revision 1.82
> > diff -u -r1.82 mercury_trace_declarative.c
> > --- trace/mercury_trace_declarative.c	12 Mar 2005 04:46:33 -0000	1.82
> > +++ trace/mercury_trace_declarative.c	27 Mar 2005 09:02:13 -0000
> > @@ -99,6 +99,17 @@
> >  #endif
> >
> >  /*
> > +** The message to display when attempting to retry of an untabled area.
> > +*/
> > +
> > +#define MR_DECL_UNTABLED_IO_RETRY_MESSAGE \
> > +	"The declarative debugger needs to perform a retry across\n" \
> > +	"an area which is not IO tabled.  This is not always safe.\n" \
> 
> s/which is not IO tabled/in which IO is not tabled/.
> 

Okay.

> > +	"To avoid this warning restart mdb and issue a `table_io start'\n" \
> > +	"command at an event before the suspect area.\n" \
> > +	"Do you wish to proceed with the retry? "
> > +
> > +/*
> >  ** The declarative debugger back end is controlled by the
> >  ** settings of the following variables.  They are set in
> >  ** MR_trace_start_decl_debug when the back end is started.  They
> > @@ -194,6 +205,15 @@
> >  static	MR_bool		MR_edt_compiler_flag_warning;
> >
> >  /*
> > +** When building a supertree there will be 2 retries.  The first will
> > +** retry to an event before the topmost node of the currently materialized
> > +** tree and the second will be a retry from the topmost node to the root
> > +** of the new supertree.  This global records whether the user said it
> > +** was safe to do the first retry across untabled IO.  If they said this was
> > +** okay then there's no point asked them again for the second retry.
> 
> s/asked/asking/
> 
> The rest looks ok.
> 

Thanks for that.

Ian.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------