[m-dev.] for review: handling layouts of compiler-generated procedures

[Fergus Henderson]

On 20-Feb-1999, Erwan Jahier <Erwan.Jahier at irisa.fr> wrote:
> 
> +found_match_user(EventNumber, CallNumber, DepthNumber, Port, PredOrFunc, 
...
> @@ -325,8 +392,15 @@
>  		match(MatchCallNumber, CallNumber),
>  		match(MatchDepthNumber, DepthNumber),
>  		match(MatchPort, Port),
> +		(	
> +			UserPredMatch = match_user_pred(
> +				MatchPredOrFunc, MatchDeclModuleName)
> +		;
> +			UserPredMatch = match_any_pred
> +		),
>  		match(MatchPredOrFunc, PredOrFunc),
> +		match(MatchDeclModuleName, DeclModuleName),

Those two lines should be inside the if-then-else,
otherwise it won't compile, will it?

> +found_match_comp(EventNumber, CallNumber, DepthNumber, Port, NameType, 
> +		ModuleType, DefModuleName, PredName, Arity, ModeNum, 
> +		Determinism, Args, Path, DebuggerRequest) :-
> +	(
> +		DebuggerRequest = forward_move(MatchEventNumber,
> +			MatchCallNumber, MatchDepthNumber, MatchPort,
> +			CompilerGeneratedPredMatch,
> +			MatchDefModuleName, MatchPredName, MatchArity, 
> +			MatchModeNum, MatchDeterminism, MatchArgs, MatchPath)
> +	->
> +		match(MatchEventNumber, EventNumber),
> +		match(MatchCallNumber, CallNumber),
> +		match(MatchDepthNumber, DepthNumber),
> +		match(MatchPort, Port),
> +		(
> +			CompilerGeneratedPredMatch = 
> +				match_compiler_generated_pred(MatchNameType, 
> +					MatchModuleType)
> +		;
> +			UserPredMatch = match_any_pred
> +		),
> +		match(MatchNameType, NameType),
> +		match(MatchModuleType, ModuleType),

Likewise here.

Apart from that, this change looks fine now.

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "Binaries may die
WWW: <http://www.cs.mu.oz.au/~fjh>  |   but source code lives forever"
PGP: finger fjh at 128.250.37.3        |     -- leaked Microsoft memo.