X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fspecialise%2FRules.lhs;h=10eb3f8e862daf58025c9b681688c7eb213df507;hb=8ab093423360990fc108d86098fc6bfb3b555269;hp=6fc35a515b03d99eb8001d37a9ba4dcb93fa3ec4;hpb=29723ae3cdf941a9647d2cd67e5aa15bab8f4e22;p=ghc-hetmet.git

diff --git a/compiler/specialise/Rules.lhs b/compiler/specialise/Rules.lhs
index 6fc35a5..10eb3f8 100644
--- a/compiler/specialise/Rules.lhs
+++ b/compiler/specialise/Rules.lhs
@@ -348,19 +348,25 @@ matchN in_scope tmpl_vars tmpl_es target_es
 				Just e -> e
 				other  -> unbound tmpl_var'
  
-    unbound var = pprPanic "Template variable unbound in rewrite rule" (ppr var)
+    unbound var = pprPanic "Template variable unbound in rewrite rule" 
+			(ppr var $$ ppr tmpl_vars $$ ppr tmpl_vars' $$ ppr tmpl_es $$ ppr target_es)
 \end{code}
 
 Note [Template binders]
 ~~~~~~~~~~~~~~~~~~~~~~~
 Consider the following match:
 	Template:  forall x.  f x 
-	Taret:     f (x+1)
-This should succeed, because the template variable 'x' has nothing to do with
-the 'x' in the target.
+	Target:     f (x+1)
+This should succeed, because the template variable 'x' has 
+nothing to do with the 'x' in the target. 
 
-To achive this, we use rnBndrL to rename the template variables if necessary;
-the renamed ones are the tmpl_vars'
+On reflection, this case probably does just work, but this might not
+	Template:  forall x. f (\x.x) 
+	Target:    f (\y.y)
+Here we want to clone when we find the \x, but to know that x must be in scope
+
+To achive this, we use rnBndrL to rename the template variables if
+necessary; the renamed ones are the tmpl_vars'
 
 
 	---------------------------------------------
@@ -591,7 +597,7 @@ match_var menv subst@(tv_subst, id_subst, binds) v1 e2
 		| otherwise	-- No renaming to do on e2
 		-> Just (tv_subst, extendVarEnv id_subst v1' e2, binds)
 
-	Just e2' | tcEqExprX (nukeRnEnvL rn_env) e2' e2 
+	Just e1' | tcEqExprX (nukeRnEnvL rn_env) e1' e2 
 		 -> Just subst
 
 		 | otherwise