for review: fix to Andrew's CVS merge errors

[Fergus Henderson]

Hi,

Andrew and Simon, can you both please check this?

Estimated hours taken: 1

compiler/modecheck_unify.m:
	Fix some errors that bromage introduced when merging in
	stayl's changes.

Index: modecheck_unify.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/modecheck_unify.m,v
retrieving revision 1.29
diff -u -u -r1.29 modecheck_unify.m
--- modecheck_unify.m	1998/02/13 10:12:20	1.29
+++ modecheck_unify.m	1998/02/13 17:51:15
@@ -472,11 +472,10 @@
 		% Now modecheck the unification of X with the lambda-expression.
 		%
 
-		set__to_sorted_list(NonLocals, ArgVars),
+		RHS0 = lambda_goal(PredOrFunc, ArgVars, Vars, Modes, Det, Goal),
 		modecheck_unify_lambda(X, PredOrFunc, ArgVars, Modes,
-				Det, Unification0, Mode, Unification,
-				ModeInfo12, ModeInfo),
-		RHS = lambda_goal(PredOrFunc, Vars, Modes, Det, Goal)
+				Det, RHS0, Unification0, Mode,
+				RHS, Unification, ModeInfo12, ModeInfo)
 	;
 		list__filter(lambda([Var :: in] is semidet,
 			( instmap__lookup_var(InstMap1, Var, Inst),
@@ -494,7 +493,8 @@
 			error("modecheck_unification(lambda): very strange var")
 		),
 			% return any old garbage
-		RHS = lambda_goal(PredOrFunc, Vars, Modes0, Det, Goal0),
+		RHS = lambda_goal(PredOrFunc, ArgVars, Vars,
+				Modes0, Det, Goal0),
 		Mode = (free -> free) - (free -> free),
 		Unification = Unification0
 	).

-- 
Fergus Henderson <fjh at cs.mu.oz.au>   |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>   |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3         |     -- the last words of T. S. Garp.