From 6c9ddcda8bf23c968e3a56667f41b1f398ac3422 Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 11 Jan 2007 11:42:39 +0000 Subject: fix in etaexpand optimization --- src/GF/Compile/Optimize.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/GF/Compile') diff --git a/src/GF/Compile/Optimize.hs b/src/GF/Compile/Optimize.hs index 6cbd302f5..61e1615f0 100644 --- a/src/GF/Compile/Optimize.hs +++ b/src/GF/Compile/Optimize.hs @@ -167,8 +167,12 @@ partEval opts gr (context, val) trm = errIn ("parteval" +++ prt_ trm) $ do etaExpand su t = do t' <- comp su t case t' of - R _ -> comp su t' --- return t' wo noexpand... + R _ | rightType t' -> comp su t' --- return t' wo noexpand... _ -> recordExpand val t' >>= comp su + -- don't eta expand records of right length (correct by type checking) + rightType t = case (t,val) of + (R rs, RecType ts) -> length rs == length ts + _ -> False outCase subst t = do pts <- getParams context -- cgit v1.2.3