[m-dev.] for review: update alias branch

[David Overton]

On Tue, May 04, 1999 at 03:55:23PM EST, Simon Taylor wrote:
[...]
> 
> 
> The following modules are new to the alias branch, the diffs
> are relative to the main branch.
> 
[...]
>  
> +:- import_module unsafe, io.
> +
>  magic_util__add_to_magic_predicate(PredProcId, Rule, RuleArgs) -->
>  	magic_info_get_magic_map(MagicMap),
>  	{ map__lookup(MagicMap, PredProcId, MagicPred) },
> @@ -901,13 +903,22 @@
>  	%
>  	{ map__from_corresponding_lists(RuleArgs, MagicProcHeadVars, Subn0) },
>  	{ goal_util__goal_vars(Rule, RuleVars0) },
> +
> +	{ io(io__write_string("Rule vars ")) },
> +	{ io(io__write(RuleVars0)) },
> +	{ io(io__nl) },
> +

This looks like debugging code that has been left in.  Do you still
need it there?  If so, please mention it in the log message,
otherwise, remove it.

[...]
>  		InputArgModes, MagicOutputModes) },
> @@ -1023,35 +1039,40 @@
>  	%
>  	% Compute a goal_info for the call.
>  	%
> -	{ goal_list_instmap_delta(Goals, Delta0) },
>  	{ set__list_to_set(SuppArgs, SuppArgSet) },
> -	{ instmap_delta_restrict(Delta0, SuppArgSet, Delta) },
> +	{ instmap_delta_init_reachable(Delta) },
>  	{ goal_info_init(SuppArgSet, Delta, nondet, GoalInfo) },
> +	{ conj_list_to_goal(Goals, GoalInfo, ConjGoal) },
> +	{ list__length(SuppArgs, NumArgs) },
> +	{ list__duplicate(NumArgs, live, IsLives) },

Shouldn't IsLives be obtained from `proc_info_arglives'?

> +	magic_info_get_module_info(ModuleInfo0),
> +	magic_info_get_proc_info(ProcInfo0),
> +	{ proc_info_vartypes(ProcInfo0, VarTypes) },
> +	{ proc_info_get_initial_instmap(ProcInfo0, ModuleInfo0, InstMap) },
> +	{ proc_info_inst_table(ProcInfo0, InstTable0) },
> +	{ recompute_instmap_delta(SuppArgs, IsLives, VarTypes, ConjGoal,
> +		SuppGoal, InstMap, InstTable0, InstTable, _,
> +		ModuleInfo0, ModuleInfo1) },
> +	{ proc_info_set_inst_table(ProcInfo0, InstTable, ProcInfo) },
> +	magic_info_set_proc_info(ProcInfo),
>  

The rest of this diff looks fine.

-- 
David Overton           Department of Computer Science & Software Engineering
MEngSc Student          The University of Melbourne, Australia
+61 3 9344 9159         http://www.cs.mu.oz.au/~dmo
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------