[m-rev.] for review: extending I/O tabling towards declarative debugging

Mark Brown dougl at cs.mu.OZ.AU
Thu Feb 21 19:49:49 AEDT 2002


The changes here are fine; you can go ahead and commit this.
Below is a few comments about the interdiff problem.

Cheers,
Mark.

On Tue, Feb 19, 2002 at 06:55:51PM +1100, Zoltan Somogyi wrote:
> 
> Here is the relative diff addressing your comments. Unfortunately, interdiff
> also includes a bunch of non-differences; I don't know why.

The man page for interdiff says:

       Unfortunately, interdiff is not 100% reliable yet.  Please
       report bugs to Tim Waugh <twaugh at redhat.com>.

> reverted:

Anyone know what 'reverted' means in the output of interdiff?  It appears
in one or two other places in the diff as well.

> diff -u library/varset.m library/varset.m
> --- library/varset.m	2001/12/25 15:10:22
> +++ library/varset.m	4 Feb 2002 02:53:18 -0000
> @@ -1,5 +1,5 @@
>  %---------------------------------------------------------------------------%
> -% Copyright (C) 1993-2000 The University of Melbourne.
> +% Copyright (C) 1993-2000,2002 The University of Melbourne.
>  % This file may only be copied under the terms of the GNU Library General
>  % Public License - see the file COPYING.LIB in the Mercury distribution.
>  %---------------------------------------------------------------------------%
> 2 out of 5 hunks FAILED -- saving rejects to file /tmp/interdiff-1.fq7Pmz.rej


This seems related to the non-differences in the diff.  A similar message
appears elsewhere in the diff as well.

> diff -u trace/mercury_trace_vars.c trace/mercury_trace_vars.c
> --- trace/mercury_trace_vars.c	2002/01/18 04:23:26
> +++ trace/mercury_trace_vars.c	19 Feb 2002 07:05:49 -0000
> @@ -450,7 +450,7 @@
>  	}
>  
>  	slot_max = slot;
> -	MR_free(type_params);
> +	free(type_params);
>  
>  	if (slot_max > 0) {
>  		qsort(MR_point.MR_point_vars, slot_max,
> @@ -469,7 +469,7 @@
>  	}
>  
>  	slot_max = slot;
> -	free(type_params);
> +	MR_free(type_params);
>  
>  	if (slot_max > 0) {
>  		qsort(MR_point.MR_point_vars, slot_max,
> @@ -659,6 +659,26 @@
>  	return NULL;
>  }
>  
> +/*
> +** The following declaration allocates a cell to a typeinfo even if though
> +** its arity is zero. This wastes a word of space but avoids depending on the

This was actually part of the context of one of the original hunks.
Interdiff has got itself very confused indeed; *sigh*.

> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +	return NULL;
> +}
> +
>  static void
>  MR_generate_proc_name_from_layout(const MR_Proc_Layout *proc_layout,
>  	MR_ConstString *proc_name_ptr, int *arity_ptr, MR_Word *is_func_ptr)
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the reviews mailing list